summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-05-16 11:18:57 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-05-16 11:18:57 +0000
commitf243db26ac7b9c02f29b43a7d06a0562b64b609a (patch)
treedc755a87a260d3b955986938689caa9da4f0df48 /legacy/emotion
parentcf46d0d3880c75365567db055c7f521b42657c2f (diff)
fix video overlay suport in emotion.
SVN revision: 71161
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/ChangeLog37
-rw-r--r--legacy/emotion/configure.ac53
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c15
3 files changed, 44 insertions, 61 deletions
diff --git a/legacy/emotion/ChangeLog b/legacy/emotion/ChangeLog
index e5c75444bb..13510b70b8 100644
--- a/legacy/emotion/ChangeLog
+++ b/legacy/emotion/ChangeLog
@@ -1,35 +1,3 @@
12007-09-01 Vincent Torri <doursse at users dot sf dot net>
2
3 * src/modules/emotion_gstreamer.c: (em_file_open):
4 * src/modules/emotion_gstreamer_pipeline.c: (cb_handoff),
5 (emotion_pipeline_dvd_build), (emotion_pipeline_uri_build),
6 (emotion_pipeline_file_build), (_emotion_streams_sinks_get),
7 (_emotion_video_sink_fill), (_emotion_audio_sink_fill):
8 * src/modules/emotion_gstreamer_pipeline.h:
9 add the support of URI playback. Minor fixes.
10 Fix bug #114
11
122007-10-31 Vincent Torri <doursse at users dot sf dot net>
13
14 * configure.in:
15 * src/bin/emotion_test_main.c:
16 * src/lib/Makefile.am:
17 * src/lib/emotion_private.h:
18 * src/lib/emotion_smart.c:
19 * src/modules/Makefile.am:
20 * src/modules/emotion_gstreamer.c:
21 Use ecore_plugin instead of dlfcn
22 The modules names are now "xine" and "gstreamer" (it's useless to add
23 the extension, as ecore_plugin does not need it).
24 Look for the modules in path that is pointed by the env variable
25 EMOTION_MODULES_DIR first.
26 Fix a leak in the gstreamer module
27 Remove some trailing spaces
28 Fix bug #223
29
30 add the support of URI playback. Minor fixes.
31 Fix bug #114
32
332012-04-26 Carsten Haitzler (The Rasterman) 12012-04-26 Carsten Haitzler (The Rasterman)
34 2
35 * 1.0.0 release 3 * 1.0.0 release
@@ -37,3 +5,8 @@
372012-04-30 Jérôme Pinot 52012-04-30 Jérôme Pinot
38 6
39 * Fix build out of tree. 7 * Fix build out of tree.
8
92012-05-16 Carsten Haitzler (The Rasterman)
10
11 * Fix emotion video overlay support to detect correct engine name.
12
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 770d9daf16..0277df1ff0 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -185,33 +185,6 @@ if test "x$want_ecore_x" = "xyes" && test "x$have_ecore_x" = "xno" ; then
185 AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.]) 185 AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
186fi 186fi
187 187
188# Check if gstreamer X Overlay is available
189build_xoverlay="no"
190if test "x${enable_gstreamer}" = "xyes" ; then
191 PKG_CHECK_MODULES([GSTREAMER_INTERFACE],
192 [gstreamer-interfaces-0.10 >= 0.10.34],
193 [build_xoverlay="yes"],
194 [build_xoverlay="no"])
195 if test "x${build_xoverlay}" = "xyes" ; then
196 save_CPPFLAGS=$CPPFLAGS
197 CPPFLAGS="$CPPFLAGS ${GSTREAMER_CFLAGS} ${GSTREAMER_INTERFACE_CFLAGS}"
198 AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
199 [
200 AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])
201 build_xoverlay="yes"
202 ],
203 [build_xoverlay="no"])
204 CPPFLAGS=$save_CPPFLAGS
205
206 save_LDFLAGS=${LDFLAGS}
207 LDFLAGS="${LDFLAGS} ${GSTREAMER_INTERFACES}"
208 AC_CHECK_LIB([gstinterfaces-0.10],
209 [gst_x_overlay_set_window_handle],
210 [AC_DEFINE([HAVE_X_OVERLAY_SET], [1], [Use gst_x_overlay_set_window_handle instead of old deprecated gst_x_overlay_set_xwindow_id])])
211 LDFLAGS=$sava_LDFLAGS
212 fi
213fi
214
215### Checks for header files 188### Checks for header files
216 189
217AC_CHECK_HEADERS([unistd.h]) 190AC_CHECK_HEADERS([unistd.h])
@@ -289,6 +262,32 @@ if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test
289 AC_MSG_ERROR([Xine, Gstreamer or Generic backends must be selected to build Emotion]) 262 AC_MSG_ERROR([Xine, Gstreamer or Generic backends must be selected to build Emotion])
290fi 263fi
291 264
265# Check if gstreamer X Overlay is available
266build_xoverlay="no"
267if test "x${enable_gstreamer}" = "xyes" ; then
268 PKG_CHECK_MODULES([GSTREAMER_INTERFACE],
269 [gstreamer-interfaces-0.10 >= 0.10.34],
270 [build_xoverlay="yes"],
271 [build_xoverlay="no"])
272 if test "x${build_xoverlay}" = "xyes" ; then
273 save_CPPFLAGS=$CPPFLAGS
274 CPPFLAGS="$CPPFLAGS ${GSTREAMER_CFLAGS} ${GSTREAMER_INTERFACE_CFLAGS}"
275 AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
276 [
277 AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])
278 build_xoverlay="yes"
279 ],
280 [build_xoverlay="no"])
281 CPPFLAGS=$save_CPPFLAGS
282
283 save_LDFLAGS=${LDFLAGS}
284 LDFLAGS="${LDFLAGS} ${GSTREAMER_INTERFACES}"
285 AC_CHECK_LIB([gstinterfaces-0.10],
286 [gst_x_overlay_set_window_handle],
287 [AC_DEFINE([HAVE_X_OVERLAY_SET], [1], [Use gst_x_overlay_set_window_handle instead of old deprecated gst_x_overlay_set_xwindow_id])])
288 LDFLAGS=$sava_LDFLAGS
289 fi
290fi
292 291
293### install and build examples 292### install and build examples
294 293
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 5f1d26fcee..85739bd360 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -1033,9 +1033,20 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
1033#if defined HAVE_ECORE_X && defined HAVE_XOVERLAY_H 1033#if defined HAVE_ECORE_X && defined HAVE_XOVERLAY_H
1034 if (window_manager_video) 1034 if (window_manager_video)
1035 { 1035 {
1036 engines = evas_render_method_list(); 1036 Eina_List *l;
1037 const char *ename;
1038
1039 engines = evas_render_method_list();
1037 1040
1038 engine = eina_list_nth(engines, evas_output_method_get(evas_object_evas_get(obj)) - 1); 1041 EINA_LIST_FOREACH(engines, l, ename)
1042 {
1043 if (evas_render_method_lookup(ename) ==
1044 evas_output_method_get(evas_object_evas_get(obj)))
1045 {
1046 engine = ename;
1047 break;
1048 }
1049 }
1039 1050
1040 if (ev->priority && engine && strstr(engine, "_x11") != NULL) 1051 if (ev->priority && engine && strstr(engine, "_x11") != NULL)
1041 { 1052 {