summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 05:05:23 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 05:05:23 +0000
commitb85e619342aae0cd3cb6e756b4cee528c36ac36f (patch)
treee952ec75c1eacb072699a11a9d8aaff8e8d9d95f /legacy/emotion/src/modules/gstreamer
parentca775d8d81d299a509e527463a7d2aa92a2dd823 (diff)
Revert to not having seek_to_pos at all.
SVN revision: 35917
Diffstat (limited to 'legacy/emotion/src/modules/gstreamer')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c3
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 5bea6eb6ef..f78ecadee5 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -266,7 +266,6 @@ em_init(Evas_Object *obj,
266 ev->video_sink_nbr = 0; 266 ev->video_sink_nbr = 0;
267 ev->audio_sink_nbr = 0; 267 ev->audio_sink_nbr = 0;
268 ev->vis = EMOTION_VIS_GOOM; 268 ev->vis = EMOTION_VIS_GOOM;
269 ev->seek_to_pos = -1;
270 269
271 /* Create the file descriptors */ 270 /* Create the file descriptors */
272 if (pipe(fds) == 0) 271 if (pipe(fds) == 0)
@@ -558,7 +557,6 @@ em_pos_set(void *video,
558 Emotion_Audio_Sink *asink; 557 Emotion_Audio_Sink *asink;
559 558
560 ev = (Emotion_Gstreamer_Video *)video; 559 ev = (Emotion_Gstreamer_Video *)video;
561 if (ev->seek_to_pos == pos) return;
562 560
563 vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr); 561 vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
564 asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr); 562 asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr);
@@ -581,7 +579,6 @@ em_pos_set(void *video,
581 (gint64)(pos * (double)GST_SECOND), 579 (gint64)(pos * (double)GST_SECOND),
582 GST_SEEK_TYPE_NONE, -1); 580 GST_SEEK_TYPE_NONE, -1);
583 } 581 }
584 ev->seek_to_pos = pos;
585} 582}
586 583
587static void 584static void
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
index fcdfe21e66..eb2fa82c5f 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
@@ -83,7 +83,6 @@ struct _Emotion_Gstreamer_Video
83 83
84 volatile int seek_to; 84 volatile int seek_to;
85 volatile int get_poslen; 85 volatile int get_poslen;
86 volatile double seek_to_pos;
87 86
88 int fd_ev_read; 87 int fd_ev_read;
89 int fd_ev_write; 88 int fd_ev_write;