From feb962a48c70108977cb0e3c85ca3805dc70a5a6 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Wed, 10 Sep 2008 05:08:00 +0000 Subject: [PATCH] Remove seek guard, as it isn't updated during playing. SVN revision: 35918 --- .../emotion/src/modules/xine/emotion_xine.c | 20 ++++++------------- .../emotion/src/modules/xine/emotion_xine.h | 2 -- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c index 914ea0db84..657eb5a399 100644 --- a/legacy/emotion/src/modules/xine/emotion_xine.c +++ b/legacy/emotion/src/modules/xine/emotion_xine.c @@ -282,16 +282,12 @@ _em_slave(void *par) double pos; pos = *((double *)eev->xine_event); - if (ev->seeked_pos != ev->seek_to_pos) - { - if (ev->no_time) - xine_play(ev->stream, pos * 65535, 0); - else - xine_play(ev->stream, 0, pos * 1000); - if (!ev->play) - xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE); - ev->seeked_pos = ev->seek_to_pos; - } + if (ev->no_time) + xine_play(ev->stream, pos * 65535, 0); + else + xine_play(ev->stream, 0, pos * 1000); + if (!ev->play) + xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE); _em_module_event(ev, 6); } break; @@ -407,8 +403,6 @@ em_init(Evas_Object *obj, void **emotion_video, Emotion_Module_Options *opt) ev->get_pos_thread_deleted = 0; ev->opening = 1; ev->play_ok = 0; - ev->seek_to_pos = -1; - ev->seeked_pos = -1; if (opt) { @@ -509,10 +503,8 @@ em_pos_set(void *ef, double pos) double *ppos; ev = (Emotion_Xine_Video *)ef; - if (pos == ev->seek_to_pos) return; ppos = malloc(sizeof(double)); *ppos = pos; - ev->seek_to_pos = pos; _em_slave_event(ev, 6, ppos); } diff --git a/legacy/emotion/src/modules/xine/emotion_xine.h b/legacy/emotion/src/modules/xine/emotion_xine.h index 17ca0e9cc8..d7985aa20d 100644 --- a/legacy/emotion/src/modules/xine/emotion_xine.h +++ b/legacy/emotion/src/modules/xine/emotion_xine.h @@ -29,8 +29,6 @@ struct _Emotion_Xine_Video volatile int spu_channel; volatile int audio_channel; volatile int video_channel; - volatile double seek_to_pos; - volatile double seeked_pos; volatile int fq; Emotion_Vis vis; int fd_read;