1.1 --- a/src/aica/audio.h	Tue Jan 10 13:56:54 2006 +0000
     1.2 +++ b/src/aica/audio.h	Thu Jan 12 11:30:19 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: audio.h,v 1.1 2006-01-10 13:56:54 nkeynes Exp $
     1.6 + * $Id: audio.h,v 1.2 2006-01-12 11:30:19 nkeynes Exp $
     1.7   * 
     1.8   * Audio engine, ie the part that does the actual work.
     1.9   *
    1.10 @@ -40,9 +40,8 @@
    1.11      uint32_t posn_left;
    1.12      uint32_t start;
    1.13      uint32_t end;
    1.14 +    gboolean loop;
    1.15      uint32_t loop_start;
    1.16 -    uint32_t loop_end;
    1.17 -    int loop_count; /* 0 = no loop, -1 = loop forever */
    1.18      int vol_left; /* 0..255 */
    1.19      int vol_right; /* 0..255 */
    1.20      uint32_t sample_rate;
    1.21 @@ -56,8 +55,8 @@
    1.22  
    1.23  
    1.24  typedef struct audio_buffer {
    1.25 -    uint32_t length; /* Samples */
    1.26 -    uint32_t posn; /* Samples */
    1.27 +    uint32_t length; /* Bytes */
    1.28 +    uint32_t posn; /* Bytes */
    1.29      int status;
    1.30      char data[0];
    1.31  } *audio_buffer_t;
    1.32 @@ -96,7 +95,7 @@
    1.33  /**
    1.34   * Mix a single output sample and append it to the output buffers
    1.35   */
    1.36 -void audio_mix_sample( void );
    1.37 +void audio_mix_samples( int num_samples );
    1.38  
    1.39  /**
    1.40   * Retrieve the channel information for the channel, numbered 0..63.