diff options
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/input_pvr.c | 13 | ||||
| -rw-r--r-- | src/input/input_v4l.c | 4 | ||||
| -rw-r--r-- | src/input/net_buf_ctrl.c | 4 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index b8cac982e..8b47c9747 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -38,7 +38,7 @@ * usage: * xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age> * - * $Id: input_pvr.c,v 1.40 2003/12/14 22:13:23 siggi Exp $ + * $Id: input_pvr.c,v 1.41 2004/02/12 18:09:20 mroi Exp $ */ /************************************************************************** @@ -461,8 +461,6 @@ static void pvr_adjust_realtime_speed(pvr_input_plugin_t *this, fifo_buffer_t *f pvrscr_speed_tunning(this->scr, 1.0); this->speed_before_pause = speed; this->stream->xine->clock->set_speed ( this->stream->xine->clock, XINE_SPEED_PAUSE); - if( this->stream->audio_out ) - this->stream->audio_out->set_property( this->stream->audio_out, AO_PROP_PAUSED, 2 ); #ifdef SCRLOG printf("input_pvr: buffer empty, pausing playback\n" ); #endif @@ -475,8 +473,6 @@ static void pvr_adjust_realtime_speed(pvr_input_plugin_t *this, fifo_buffer_t *f pvrscr_speed_tunning(this->scr, 1.0 ); this->stream->xine->clock->set_speed ( this->stream->xine->clock, this->speed_before_pause); - if( this->stream->audio_out ) - this->stream->audio_out->set_property( this->stream->audio_out, AO_PROP_PAUSED, 0 ); #ifdef SCRLOG printf("input_pvr: resuming playback\n" ); #endif @@ -677,11 +673,8 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t this->play_blk = (this->rec_blk) ? (this->rec_blk-1) : 0; - if( speed > XINE_SPEED_NORMAL ) { + if( speed > XINE_SPEED_NORMAL ) this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_NORMAL); - if( this->stream->audio_out ) - this->stream->audio_out->set_property( this->stream->audio_out, AO_PROP_PAUSED, 0 ); - } if( this->play_fd != -1 ) { if(this->play_fd != this->rec_fd ) @@ -985,8 +978,6 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { case XINE_EVENT_SET_V4L2: /* make sure we are not paused */ this->stream->xine->clock->set_speed ( this->stream->xine->clock, XINE_SPEED_NORMAL); - if( this->stream->audio_out ) - this->stream->audio_out->set_property( this->stream->audio_out, AO_PROP_PAUSED, 0 ); if( v4l2_data->session_id != this->session ) { /* if session changes -> closes the old one */ diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 4910a508d..2de46b2fd 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1177,8 +1177,6 @@ static int v4l_adjust_realtime_speed(v4l_input_plugin_t *this, fifo_buffer_t *fi this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_PAUSE); this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0); - if (this->stream->audio_out != NULL) - this->stream->audio_out->set_property(this->stream->audio_out, AO_PROP_PAUSED, 2); this->scr_tunning = SCR_PAUSED; /* pvrscr_speed_tunning(this->scr, 0.0); */ @@ -1200,8 +1198,6 @@ static int v4l_adjust_realtime_speed(v4l_input_plugin_t *this, fifo_buffer_t *fi this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_NORMAL); this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1); - if (this->stream->audio_out != NULL) - this->stream->audio_out->set_property(this->stream->audio_out, AO_PROP_PAUSED, 0); } } else if (scr_tunning == SCR_SKIP) { if (num_used < 2 * num_free) { diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 0a328d367..e5b720a55 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -101,16 +101,12 @@ static void nbc_set_speed_pause (xine_stream_t *stream) { xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_put_cb: set_speed_pause\n"); stream->xine->clock->set_speed (stream->xine->clock, XINE_SPEED_PAUSE); stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0); - if (stream->audio_out) - stream->audio_out->set_property(stream->audio_out,AO_PROP_PAUSED,2); } static void nbc_set_speed_normal (xine_stream_t *stream) { xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_put_cb: set_speed_normal\n"); stream->xine->clock->set_speed (stream->xine->clock, XINE_SPEED_NORMAL); stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1); - if (stream->audio_out) - stream->audio_out->set_property(stream->audio_out,AO_PROP_PAUSED,0); } void nbc_check_buffers (nbc_t *this) { |