summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-11-03 17:09:23 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-11-03 17:09:23 +0000
commiteaa1a494befaea26595360eaa3f98027ee4a2c41 (patch)
tree8f86d20a4fd88573cecb43848372407b927bf91a /legacy/emotion/src/modules/gstreamer
parentfb44314af1026af4e8531677ae0ae026672cfa5f (diff)
emotion: warning--
SVN revision: 64709
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_fakeeos.c2
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c26
2 files changed, 7 insertions, 21 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_fakeeos.c b/legacy/emotion/src/modules/gstreamer/emotion_fakeeos.c
index f5831871a7..6ff20d2592 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_fakeeos.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_fakeeos.c
@@ -16,7 +16,7 @@ GST_BOILERPLATE(FakeEOSBin, fakeeos_bin, GstBin,
16static void 16static void
17fakeeos_bin_handle_message(GstBin * bin, GstMessage * message) 17fakeeos_bin_handle_message(GstBin * bin, GstMessage * message)
18{ 18{
19 FakeEOSBin *fakeeos = (FakeEOSBin *)(bin); 19 /* FakeEOSBin *fakeeos = (FakeEOSBin *)(bin); */
20 20
21 switch (GST_MESSAGE_TYPE(message)) { 21 switch (GST_MESSAGE_TYPE(message)) {
22 case GST_MESSAGE_EOS: 22 case GST_MESSAGE_EOS:
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index b9ba0dac63..4382a4edfa 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -260,15 +260,6 @@ emotion_video_stream_new(Emotion_Gstreamer_Video *ev)
260 return vstream; 260 return vstream;
261} 261}
262 262
263static void
264emotion_video_stream_free(Emotion_Gstreamer_Video *ev, Emotion_Video_Stream *vstream)
265{
266 if (!ev || !vstream) return;
267
268 ev->video_streams = eina_list_remove(ev->video_streams, vstream);
269 free(vstream);
270}
271
272static const char * 263static const char *
273emotion_visualization_element_name_get(Emotion_Vis visualisation) 264emotion_visualization_element_name_get(Emotion_Vis visualisation)
274{ 265{
@@ -1051,8 +1042,12 @@ static void
1051em_audio_channel_mute_set(void *video, 1042em_audio_channel_mute_set(void *video,
1052 int mute) 1043 int mute)
1053{ 1044{
1045 /* NOTE: at first I wanted to completly shutdown the audio path on mute,
1046 but that's not possible as the audio sink could be the clock source
1047 for the pipeline (at least that's the case on some of the hardware
1048 I have been tested emotion on.
1049 */
1054 Emotion_Gstreamer_Video *ev; 1050 Emotion_Gstreamer_Video *ev;
1055 int flags;
1056 1051
1057 ev = (Emotion_Gstreamer_Video *)video; 1052 ev = (Emotion_Gstreamer_Video *)video;
1058 1053
@@ -1061,15 +1056,6 @@ em_audio_channel_mute_set(void *video,
1061 ev->audio_mute = mute; 1056 ev->audio_mute = mute;
1062 1057
1063 g_object_set(G_OBJECT(ev->pipeline), "mute", !!mute, NULL); 1058 g_object_set(G_OBJECT(ev->pipeline), "mute", !!mute, NULL);
1064 /* This code should stop the decoding of only the audio stream, but everything stop :"( */
1065 /* g_object_get(G_OBJECT(ev->pipeline), "flags", &flags, NULL); */
1066 /* if (mute) */
1067 /* flags &= ~GST_PLAY_FLAG_AUDIO; */
1068 /* else */
1069 /* flags |= GST_PLAY_FLAG_AUDIO; */
1070 /* g_object_set(G_OBJECT(ev->pipeline), "flags", flags, NULL); */
1071 /* g_object_get(G_OBJECT(ev->pipeline), "flags", &flags, NULL); */
1072 /* fprintf(stderr, "flags-n: %x\n", flags); */
1073} 1059}
1074 1060
1075static int 1061static int
@@ -1245,7 +1231,7 @@ em_priority_get(void *video)
1245} 1231}
1246 1232
1247static Eina_Bool 1233static Eina_Bool
1248_ecore_event_x_destroy(void *data, int type, void *event) 1234_ecore_event_x_destroy(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
1249{ 1235{
1250 Ecore_X_Event_Window_Destroy *ev = event; 1236 Ecore_X_Event_Window_Destroy *ev = event;
1251 1237