summaryrefslogtreecommitdiff
path: root/legacy/emotion/src
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 05:08:00 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2008-09-10 05:08:00 +0000
commitfeb962a48c70108977cb0e3c85ca3805dc70a5a6 (patch)
tree40a88fea76f288868ecfb4acf0bcfde9dae806d7 /legacy/emotion/src
parentb85e619342aae0cd3cb6e756b4cee528c36ac36f (diff)
Remove seek guard, as it isn't updated during playing.
SVN revision: 35918
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.c20
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.h2
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)
282 double pos; 282 double pos;
283 283
284 pos = *((double *)eev->xine_event); 284 pos = *((double *)eev->xine_event);
285 if (ev->seeked_pos != ev->seek_to_pos) 285 if (ev->no_time)
286 { 286 xine_play(ev->stream, pos * 65535, 0);
287 if (ev->no_time) 287 else
288 xine_play(ev->stream, pos * 65535, 0); 288 xine_play(ev->stream, 0, pos * 1000);
289 else 289 if (!ev->play)
290 xine_play(ev->stream, 0, pos * 1000); 290 xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
291 if (!ev->play)
292 xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
293 ev->seeked_pos = ev->seek_to_pos;
294 }
295 _em_module_event(ev, 6); 291 _em_module_event(ev, 6);
296 } 292 }
297 break; 293 break;
@@ -407,8 +403,6 @@ em_init(Evas_Object *obj, void **emotion_video, Emotion_Module_Options *opt)
407 ev->get_pos_thread_deleted = 0; 403 ev->get_pos_thread_deleted = 0;
408 ev->opening = 1; 404 ev->opening = 1;
409 ev->play_ok = 0; 405 ev->play_ok = 0;
410 ev->seek_to_pos = -1;
411 ev->seeked_pos = -1;
412 406
413 if (opt) 407 if (opt)
414 { 408 {
@@ -509,10 +503,8 @@ em_pos_set(void *ef, double pos)
509 double *ppos; 503 double *ppos;
510 504
511 ev = (Emotion_Xine_Video *)ef; 505 ev = (Emotion_Xine_Video *)ef;
512 if (pos == ev->seek_to_pos) return;
513 ppos = malloc(sizeof(double)); 506 ppos = malloc(sizeof(double));
514 *ppos = pos; 507 *ppos = pos;
515 ev->seek_to_pos = pos;
516 _em_slave_event(ev, 6, ppos); 508 _em_slave_event(ev, 6, ppos);
517} 509}
518 510
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
29 volatile int spu_channel; 29 volatile int spu_channel;
30 volatile int audio_channel; 30 volatile int audio_channel;
31 volatile int video_channel; 31 volatile int video_channel;
32 volatile double seek_to_pos;
33 volatile double seeked_pos;
34 volatile int fq; 32 volatile int fq;
35 Emotion_Vis vis; 33 Emotion_Vis vis;
36 int fd_read; 34 int fd_read;