From 2fca4fccb051d384f30b3b95351d86ef34af27aa Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Sat, 26 Jul 2003 00:27:20 +0000 Subject: Stop asserts happening on underruns. Delay support for USB hotplug until linux kernel supports it better. CVS patchset: 5213 CVS date: 2003/07/26 00:27:20 --- src/xine-engine/audio_out.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 9f8909d2f..1625eb30b 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.136 2003/07/20 19:28:14 f1rmb Exp $ + * $Id: audio_out.c,v 1.137 2003/07/26 00:27:20 jcdutton Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe @@ -1063,8 +1063,9 @@ static void *ao_loop (void *this_gen) { * We should get the card into a closed state here, that involves closing * the PCM as well as the MIXER. * Maybe we should pause the stream until the USB device is plugged in again. + * Return values 0 happen even if usb not unplugged, so needs further investigation. */ - XINE_ASSERT(result > 0, "write to sound card failed. Was a USB device unplugged?"); + XINE_ASSERT(result >= 0, "write to sound card failed. Was a USB device unplugged?"); lprintf ("loop: next buf from fifo\n"); fifo_append (this->free_fifo, in_buf); -- cgit v1.2.3