Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c
Log Message:
remove seek job... let the seek request thread do it all now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_xine.c 18 Jul 2004 08:04:41 -0000 1.5
+++ emotion_xine.c 18 Jul 2004 08:25:45 -0000 1.6
@@ -331,8 +331,6 @@
Emotion_Xine_Video *ev;
ev = (Emotion_Xine_Video *)ef;
- printf("xn stop\n");
- xine_stop(ev->stream);
ev->delete_me = 1;
// pthread_mutex_lock(&(ev->seek_mutex));
pthread_cond_broadcast(&(ev->seek_cond));
@@ -346,11 +344,9 @@
ecore_main_fd_handler_del(ev->fd_ev_handler);
close(ev->fd_ev_write);
close(ev->fd_ev_read);
- printf("xn close\n");
+ xine_stop(ev->stream);
xine_close(ev->stream);
- printf("xn dispose\n");
xine_dispose(ev->stream);
- printf("xn dispose evq\n");
xine_event_dispose_queue(ev->queue);
if (ev->video) xine_close_video_driver(decoder, ev->video);
if (ev->audio) xine_close_audio_driver(decoder, ev->audio);
@@ -960,19 +956,18 @@
pthread_cond_wait(&(ev->seek_cond), &(ev->seek_mutex));
while (ev->seek_to > 0)
{
- if (ppos != ev->seek_to_pos)
- {
- ppos = ev->seek_to_pos;
- xine_play(ev->stream, 0, ev->seek_to_pos * 1000);
- }
+ again:
+ ppos = ev->seek_to_pos;
+ xine_play(ev->stream, 0, ppos * 1000);
ev->seek_to = 0;
if (ev->delete_me) return NULL;
}
if (!ev->play)
xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
if (ev->delete_me) return NULL;
- usleep(1000000 / 10);
- }
+ if (ppos != ev->seek_to_pos)
+ goto again;
+ }
return NULL;
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
