From: <no-...@en...> - 2008-09-10 04:29:54
|
Author: englebass Date: 2008-09-09 21:29:52 -0700 (Tue, 09 Sep 2008) New Revision: 35913 Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h Log: Keep guard against seeking to the same position, but initialize to -1. Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2008-09-10 04:24:38 UTC (rev 35912) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2008-09-10 04:29:52 UTC (rev 35913) @@ -266,6 +266,7 @@ ev->video_sink_nbr = 0; ev->audio_sink_nbr = 0; ev->vis = EMOTION_VIS_GOOM; + ev->seek_to_pos = -1; /* Create the file descriptors */ if (pipe(fds) == 0) @@ -557,6 +558,7 @@ Emotion_Audio_Sink *asink; ev = (Emotion_Gstreamer_Video *)video; + if (ev->seek_to_pos == pos) return; vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr); asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr); @@ -579,6 +581,7 @@ (gint64)(pos * (double)GST_SECOND), GST_SEEK_TYPE_NONE, -1); } + ev->seek_to_pos = pos; } static void Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2008-09-10 04:24:38 UTC (rev 35912) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2008-09-10 04:29:52 UTC (rev 35913) @@ -83,6 +83,7 @@ volatile int seek_to; volatile int get_poslen; + volatile double seek_to_pos; int fd_ev_read; int fd_ev_write; |
From: <no-...@en...> - 2008-09-10 05:05:24
|
Author: englebass Date: 2008-09-09 22:05:23 -0700 (Tue, 09 Sep 2008) New Revision: 35917 Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h Log: Revert to not having seek_to_pos at all. Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2008-09-10 05:00:32 UTC (rev 35916) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2008-09-10 05:05:23 UTC (rev 35917) @@ -266,7 +266,6 @@ ev->video_sink_nbr = 0; ev->audio_sink_nbr = 0; ev->vis = EMOTION_VIS_GOOM; - ev->seek_to_pos = -1; /* Create the file descriptors */ if (pipe(fds) == 0) @@ -558,7 +557,6 @@ Emotion_Audio_Sink *asink; ev = (Emotion_Gstreamer_Video *)video; - if (ev->seek_to_pos == pos) return; vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr); asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr); @@ -581,7 +579,6 @@ (gint64)(pos * (double)GST_SECOND), GST_SEEK_TYPE_NONE, -1); } - ev->seek_to_pos = pos; } static void Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2008-09-10 05:00:32 UTC (rev 35916) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2008-09-10 05:05:23 UTC (rev 35917) @@ -83,7 +83,6 @@ volatile int seek_to; volatile int get_poslen; - volatile double seek_to_pos; int fd_ev_read; int fd_ev_write; |
From: Enlightenment S. <no-...@en...> - 2009-11-08 20:27:13
|
Log: Remove unused variable Author: englebass Date: 2009-11-08 12:27:02 -0800 (Sun, 08 Nov 2009) New Revision: 43539 Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2009-11-08 20:26:51 UTC (rev 43538) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2009-11-08 20:27:02 UTC (rev 43539) @@ -240,7 +240,6 @@ { Emotion_Gstreamer_Video *ev; GError *error; - int fds[2]; if (!emotion_video) return 0; |
From: Enlightenment S. <no-...@en...> - 2010-01-16 14:13:17
|
Log: remove Ecore_Data Author: englebass Date: 2010-01-16 06:13:11 -0800 (Sat, 16 Jan 2010) New Revision: 45225 Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2010-01-16 13:58:02 UTC (rev 45224) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.h 2010-01-16 14:13:11 UTC (rev 45225) @@ -7,7 +7,6 @@ #include <Evas.h> #include <Ecore.h> -#include <Ecore_Data.h> #define HTTP_STREAM 0 #define RTSP_STREAM 1 |
From: Enlightenment S. <no-...@en...> - 2010-02-09 21:05:03
|
Log: Make clang happy Author: englebass Date: 2010-02-09 13:04:56 -0800 (Tue, 09 Feb 2010) New Revision: 46023 Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c Modified: trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c =================================================================== --- trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2010-02-09 20:55:24 UTC (rev 46022) +++ trunk/emotion/src/modules/gstreamer/emotion_gstreamer.c 2010-02-09 21:04:56 UTC (rev 46023) @@ -918,14 +918,16 @@ } static void -em_video_channel_set(void *video, - int channel) +em_video_channel_set(void *video __UNUSED__, + int channel __UNUSED__) { +#if 0 Emotion_Gstreamer_Video *ev; ev = (Emotion_Gstreamer_Video *)video; if (channel < 0) channel = 0; +#endif /* FIXME: a faire... */ } @@ -980,14 +982,16 @@ } static void -em_audio_channel_set(void *video, - int channel) +em_audio_channel_set(void *video __UNUSED__, + int channel __UNUSED__) { +#if 0 Emotion_Gstreamer_Video *ev; ev = (Emotion_Gstreamer_Video *)video; if (channel < -1) channel = -1; +#endif /* FIXME: a faire... */ } |