From 5807b51c46b31abe0fecedb8f1a783f2bd74a18d Mon Sep 17 00:00:00 2001 From: uid86226 Date: Mon, 16 Feb 2004 20:19:09 +0000 Subject: fix freezes with input plugins that play with the speed: * use _x_set_speed() for speed manipulations, since it is ticket-safe * _x_set_speed() is an internal helper function now, move frontend locking outside of it * restrict access to metronom clock internal stuff CVS patchset: 6165 CVS date: 2004/02/16 20:19:09 --- src/input/input_v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input/input_v4l.c') diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 2de46b2fd..117c2c411 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1175,7 +1175,7 @@ static int v4l_adjust_realtime_speed(v4l_input_plugin_t *this, fifo_buffer_t *fi "Buffer is empty, pausing playback (used: %d, num_free: %d)\r\n", num_used, num_free); - this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_PAUSE); + _x_set_speed(this->stream, XINE_SPEED_PAUSE); this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0); this->scr_tunning = SCR_PAUSED; @@ -1196,7 +1196,7 @@ static int v4l_adjust_realtime_speed(v4l_input_plugin_t *this, fifo_buffer_t *fi pvrscr_speed_tunning(this->scr, 1.0); - this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_NORMAL); + _x_set_speed(this->stream, XINE_SPEED_NORMAL); this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1); } } else if (scr_tunning == SCR_SKIP) { -- cgit v1.2.3