Search
lxdream.org :: lxdream/src/aica/audio.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/aica/audio.c
changeset 106:9048bac046c3
prev82:81a4acf75f10
next111:230243c2b520
author nkeynes
date Tue Mar 14 12:45:53 2006 +0000 (14 years ago)
permissions -rw-r--r--
last change Move driver selection out to main at long last. Add video NULL driver for
headless operation
Make dcload exit() actually exit
file annotate diff log raw
1.1 --- a/src/aica/audio.c Tue Jan 17 12:54:02 2006 +0000
1.2 +++ b/src/aica/audio.c Tue Mar 14 12:45:53 2006 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /**
1.5 - * $Id: audio.c,v 1.4 2006-01-17 12:54:02 nkeynes Exp $
1.6 + * $Id: audio.c,v 1.5 2006-03-14 12:45:53 nkeynes Exp $
1.7 *
1.8 * Audio mixer core. Combines all the active streams into a single sound
1.9 * buffer for output.
1.10 @@ -52,7 +52,7 @@
1.11 * output buffers, flushing any current data and reallocating as
1.12 * necessary.
1.13 */
1.14 -void audio_set_output( audio_driver_t driver,
1.15 +void audio_set_driver( audio_driver_t driver,
1.16 uint32_t samplerate, int format )
1.17 {
1.18 uint32_t bytes_per_sample = 1;
1.19 @@ -82,7 +82,7 @@
1.20 audio.read_buffer = 0;
1.21
1.22 if( driver == NULL )
1.23 - driver = &null_audio_driver;
1.24 + driver = &audio_null_driver;
1.25 audio_driver = driver;
1.26 audio_driver->set_output_format( samplerate, format );
1.27 }
.