1.1 --- a/src/aica/audio.h	Sun Feb 05 04:01:55 2006 +0000
     1.2 +++ b/src/aica/audio.h	Tue Mar 14 12:45:53 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: audio.h,v 1.5 2006-02-05 04:01:55 nkeynes Exp $
     1.6 + * $Id: audio.h,v 1.6 2006-03-14 12:45:53 nkeynes Exp $
     1.7   * 
     1.8   * Audio engine, ie the part that does the actual work.
     1.9   *
    1.10 @@ -33,6 +33,7 @@
    1.11  #define AUDIO_FMT_SIGNED 0
    1.12  #define AUDIO_FMT_UNSIGNED 8
    1.13  
    1.14 +#define AUDIO_FMT_16ST (AUDIO_FMT_16BIT|AUDIO_FMT_STEREO)
    1.15  
    1.16  typedef struct audio_channel {
    1.17      gboolean active;
    1.18 @@ -67,15 +68,15 @@
    1.19      gboolean (*process_buffer)( audio_buffer_t buffer );
    1.20  } *audio_driver_t;
    1.21  
    1.22 -extern struct audio_driver null_audio_driver;
    1.23 -extern struct audio_driver esd_audio_driver;
    1.24 +extern struct audio_driver audio_null_driver;
    1.25 +extern struct audio_driver audio_esd_driver;
    1.26  
    1.27  /**
    1.28   * Set the output driver, sample rate and format. Also initializes the 
    1.29   * output buffers, flushing any current data and reallocating as 
    1.30   * necessary. Must be called before attempting to generate any audio.
    1.31   */
    1.32 -void audio_set_output( audio_driver_t driver, uint32_t samplerate,
    1.33 +void audio_set_driver( audio_driver_t driver, uint32_t samplerate,
    1.34  		       int format );
    1.35  
    1.36  /**