summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 04:29:52 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 04:29:52 +0000
commit6d35cd3c98aeb2c424c48dec89f3e5c049c5dad1 (patch)
tree1690c581cbb7446a00801fc58221abe04316028c /legacy/emotion/src/modules/gstreamer
parentcabff8277febe1837b3a36e8c9ed595ee0493471 (diff)
Keep guard against seeking to the same position, but initialize to -1.
SVN revision: 35913
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, 4 insertions, 0 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 0b89121b43..c505377062 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -266,6 +266,7 @@ 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;
269 270
270 /* Create the file descriptors */ 271 /* Create the file descriptors */
271 if (pipe(fds) == 0) 272 if (pipe(fds) == 0)
@@ -557,6 +558,7 @@ em_pos_set(void *video,
557 Emotion_Audio_Sink *asink; 558 Emotion_Audio_Sink *asink;
558 559
559 ev = (Emotion_Gstreamer_Video *)video; 560 ev = (Emotion_Gstreamer_Video *)video;
561 if (ev->seek_to_pos == pos) return;
560 562
561 vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr); 563 vsink = (Emotion_Video_Sink *)ecore_list_index_goto(ev->video_sinks, ev->video_sink_nbr);
562 asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr); 564 asink = (Emotion_Audio_Sink *)ecore_list_index_goto(ev->video_sinks, ev->audio_sink_nbr);
@@ -579,6 +581,7 @@ em_pos_set(void *video,
579 (gint64)(pos * (double)GST_SECOND), 581 (gint64)(pos * (double)GST_SECOND),
580 GST_SEEK_TYPE_NONE, -1); 582 GST_SEEK_TYPE_NONE, -1);
581 } 583 }
584 ev->seek_to_pos = pos;
582} 585}
583 586
584static void 587static void
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
index 66d5352c2b..b33560465d 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.h
@@ -83,6 +83,7 @@ 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;
86 87
87 int fd_ev_read; 88 int fd_ev_read;
88 int fd_ev_write; 89 int fd_ev_write;