summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2008-04-13 22:19:08 +0000
committerphintuka <phintuka>2008-04-13 22:19:08 +0000
commit3bcb54e5aa3ea96cd7b63001eb35e9e878bf7c23 (patch)
tree7226c0400b8ed86c8f9a107979e614239ca4b5f1
parent83753210c717c4fb356ec797d255433e20a5c0d1 (diff)
downloadxineliboutput-3bcb54e5aa3ea96cd7b63001eb35e9e878bf7c23.tar.gz
xineliboutput-3bcb54e5aa3ea96cd7b63001eb35e9e878bf7c23.tar.bz2
Cleanup
-rw-r--r--xine_input_vdr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index c970e3c1..1ae0e32f 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.133 2008-04-12 19:37:41 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.134 2008-04-13 22:19:08 phintuka Exp $
*
*/
@@ -692,8 +692,6 @@ static void reset_scr_tunning(vdr_input_plugin_t *this, int new_speed)
static void vdr_adjust_realtime_speed(vdr_input_plugin_t *this)
{
- if(this->scr_live_sync) {
-
/*
* Grab current buffer usage
*/
@@ -819,7 +817,10 @@ static void vdr_adjust_realtime_speed(vdr_input_plugin_t *this)
*/
} else if( _x_get_fine_speed(this->stream) == XINE_FINE_SPEED_NORMAL) {
- if(this->no_video) { /* radio stream ? */
+ if(!this->scr_live_sync) {
+ scr_tunning = SCR_TUNNING_OFF;
+
+ } else if(this->no_video) { /* radio stream ? */
if( num_used >= (RADIO_MAX_BUFFERS-1))
scr_tunning = +1; /* play faster */
else if( num_used <= (RADIO_MAX_BUFFERS/3))
@@ -859,7 +860,6 @@ static void vdr_adjust_realtime_speed(vdr_input_plugin_t *this)
} else if( this->scr_tunning ) {
reset_scr_tunning(this, -1);
}
- }
}
#else /* ADJUST_SCR_SPEED */
@@ -5531,7 +5531,7 @@ static void vdr_plugin_dispose (input_plugin_t *this_gen)
pthread_cond_broadcast(&this->engine_flushed);
while(pthread_cond_destroy(&this->engine_flushed) == EBUSY) {
- LOGMSG("engine_flushed busy !");
+ LOGMSG("discard_signal busy !");
pthread_cond_broadcast(&this->engine_flushed);
xine_usec_sleep(10);
}