From 891e37854441cb118f1ede50ea5bcbc9ca34caac Mon Sep 17 00:00:00 2001 From: phintuka Date: Sat, 7 Feb 2009 18:59:19 +0000 Subject: vdr_flush_engine(): Moved ts_data_flush() call to mutex-protected section --- xine_input_vdr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xine_input_vdr.c b/xine_input_vdr.c index 4f72357f..43406570 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.219 2009-02-07 16:19:41 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.220 2009-02-07 18:59:19 phintuka Exp $ * */ @@ -1974,15 +1974,13 @@ static void vdr_flush_engine(vdr_input_plugin_t *this, uint64_t discard_index) return; } - ts_data_flush(this); - if(this->curpos > discard_index) { if(this->curpos < this->guard_index) { LOGMSG("vdr_flush_engine: guard > curpos, flush skipped"); return; } - LOGMSG("vdr_flush_engine: %"PRIu64" < current position, flush skipped", - discard_index); + LOGMSG("vdr_flush_engine: %"PRIu64" < current position %"PRIu64", flush skipped", + discard_index, this->curpos); return; } @@ -1999,6 +1997,8 @@ static void vdr_flush_engine(vdr_input_plugin_t *this, uint64_t discard_index) suspend_demuxer(this); pthread_mutex_lock( &this->lock ); + ts_data_flush(this); + reset_scr_tuning(this, this->speed_before_pause); /* reset speed again (adjust_realtime_speed might have set pause) */ -- cgit v1.2.3