From: Lorenzo D. <lor...@fa...> - 2010-07-21 19:18:36
|
# HG changeset patch # User Lorenzo Desole <lor...@fa...> # Date 1279738270 -7200 # Node ID a7571812c9d07985c8bb6b009652fe49735f3d09 # Parent 90e9f4fef807bc0ee357a7c531895f65e8f03159 Remove duplicate code diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -343,17 +343,8 @@ /* someone may want to interrupt us */ if( stream->demux_action_pending ) { - struct timeval tv; struct timespec ts; - - gettimeofday(&tv, NULL); - ts.tv_sec = tv.tv_sec; - ts.tv_nsec = (tv.tv_usec + 100000) * 1000; - if (ts.tv_nsec >= 1000000000) { - ts.tv_nsec -= 1000000000; - ts.tv_sec += 1; - } - + ts = _x_compute_interval(100); pthread_cond_timedwait (&stream->demux_resume, &stream->demux_lock, &ts); } } |