summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-10-23 09:21:14 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-10-23 09:21:14 +0000
commit93f1aa981e63be97fb5435bbfa332f87236c07c7 (patch)
tree08d74b151ab7c54c523ddee5ba6994af6f3d0ead /legacy/emotion
parenta01bc5dae9f2b631d2d1893b72e23c231f56c3ef (diff)
emotion: correctly guard Ecore_X usage.
SVN revision: 64322
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index c9af841829..b03af812b3 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -1039,7 +1039,9 @@ _video_resize(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface
1039{ 1039{
1040 Emotion_Gstreamer_Video *ev = data; 1040 Emotion_Gstreamer_Video *ev = data;
1041 1041
1042#ifdef HAVE_ECORE_X
1042 ecore_x_window_resize(ev->win, w, h); 1043 ecore_x_window_resize(ev->win, w, h);
1044#endif
1043 fprintf(stderr, "resize: %i, %i\n", w, h); 1045 fprintf(stderr, "resize: %i, %i\n", w, h);
1044} 1046}
1045 1047
@@ -1048,11 +1050,13 @@ _video_move(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
1048 Evas_Coord x, Evas_Coord y) 1050 Evas_Coord x, Evas_Coord y)
1049{ 1051{
1050 Emotion_Gstreamer_Video *ev = data; 1052 Emotion_Gstreamer_Video *ev = data;
1053#ifdef HAVE_ECORE_X
1051 unsigned int pos[2]; 1054 unsigned int pos[2];
1052 1055
1053 fprintf(stderr, "move: %i, %i\n", x, y); 1056 fprintf(stderr, "move: %i, %i\n", x, y);
1054 pos[0] = x; pos[1] = y; 1057 pos[0] = x; pos[1] = y;
1055 ecore_x_window_prop_card32_set(ev->win, ECORE_X_ATOM_E_VIDEO_POSITION, pos, 2); 1058 ecore_x_window_prop_card32_set(ev->win, ECORE_X_ATOM_E_VIDEO_POSITION, pos, 2);
1059#endif
1056} 1060}
1057 1061
1058#if 0 1062#if 0
@@ -1095,7 +1099,9 @@ _video_show(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
1095 Emotion_Gstreamer_Video *ev = data; 1099 Emotion_Gstreamer_Video *ev = data;
1096 1100
1097 fprintf(stderr, "show xv\n"); 1101 fprintf(stderr, "show xv\n");
1102#ifdef HAVE_ECORE_X
1098 ecore_x_window_show(ev->win); 1103 ecore_x_window_show(ev->win);
1104#endif
1099 /* gst_pad_set_blocked_async(ev->teepad, TRUE, _block_pad_link_cb, ev); */ 1105 /* gst_pad_set_blocked_async(ev->teepad, TRUE, _block_pad_link_cb, ev); */
1100} 1106}
1101 1107
@@ -1105,7 +1111,9 @@ _video_hide(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
1105 Emotion_Gstreamer_Video *ev = data; 1111 Emotion_Gstreamer_Video *ev = data;
1106 1112
1107 fprintf(stderr, "hide xv\n"); 1113 fprintf(stderr, "hide xv\n");
1114#ifdef HAVE_ECORE_X
1108 ecore_x_window_hide(ev->win); 1115 ecore_x_window_hide(ev->win);
1116#endif
1109 /* gst_pad_set_blocked_async(ev->teepad, TRUE, _block_pad_unlink_cb, ev); */ 1117 /* gst_pad_set_blocked_async(ev->teepad, TRUE, _block_pad_unlink_cb, ev); */
1110} 1118}
1111 1119