From d9eaeafe7c404d3e48961ddfcd8cee7299a3fa76 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 23 Aug 2008 21:02:00 -0700 Subject: outputBuffer: never calculate xfade time if xfade is off We don't assert on xfade_time > 0 inside any of the xfade calculations since we have no lock around xfade_time. --- src/outputBuffer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/outputBuffer.c') diff --git a/src/outputBuffer.c b/src/outputBuffer.c index 541461746..7e899e574 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -422,9 +422,11 @@ static void play_next_chunk(void) return; } - if (ob.xfade_time <= 0 && nr < ob.bpp_cur) { - prevent_buffer_underrun(); - return; + if (ob.xfade_time <= 0) { + if (nr < ob.bpp_cur) { + prevent_buffer_underrun(); + return; + } } else if (nr < xfade_chunks_needed(vec)) { if (dc.state != DC_STATE_STOP && playlist_playing()) { prevent_buffer_underrun(); -- cgit v1.2.3