* Makefile :

[vlc] / include / audio_output.h

diff --git a/include/audio_output.h b/include/audio_output.h
index 90cac84327f6ce01f8766bd779cc204e58eb2d58..b1f7a20b2ce12b403d7bb4abf52c5ebc3b7f48b8 100644 (file)
--- a/include/audio_output.h
+++ b/include/audio_output.h
@@ -36,11 +36,6 @@
 #define AOUT_DEFAULT_RATE       44100
 #define AOUT_MAX_RATE           48000
 
-/* Number of audio samples (s16 integers) contained in an audio output frame...
- * - Layer I        : a decoded frame contains 384 samples
- * - Layer II & III : a decoded frame contains 1152 = 3*384 samples */
-#define AOUT_FRAME_SIZE         384
-
 /* Number of audio output frames contained in an audio output fifo.
  * (AOUT_FIFO_SIZE + 1) must be a power of 2, in order to optimise the
  * %(AOUT_FIFO_SIZE + 1) operation with an &AOUT_FIFO_SIZE.
@@ -114,11 +109,6 @@ typedef struct
 
 } aout_increment_t;
 
-/******************************************************************************
- * aout_frame_t
- ******************************************************************************/
-typedef s16 aout_frame_t[ AOUT_FRAME_SIZE ];
-
 /******************************************************************************
  * aout_fifo_t
  ******************************************************************************/
@@ -134,6 +124,7 @@ typedef struct
     vlc_mutex_t         data_lock;
     vlc_cond_t          data_wait;
 
+    long                l_frame_size;
     void *              buffer;
     mtime_t *           date;
     /* The start frame is the first frame in the buffer that contains decoded
@@ -197,10 +188,9 @@ typedef struct aout_thread_s
 /******************************************************************************
  * Prototypes
  ******************************************************************************/
-int             aout_Open               ( aout_thread_t *p_aout );
-int             aout_SpawnThread        ( aout_thread_t *p_aout );
-void            aout_CancelThread       ( aout_thread_t *p_aout );
-void            aout_Close              ( aout_thread_t *p_aout );
+aout_thread_t * aout_CreateThread       ( int *pi_status );
+void            aout_DestroyThread      ( aout_thread_t *p_aout, int *pi_status );
+
 
 aout_fifo_t *   aout_CreateFifo         ( aout_thread_t *p_aout, aout_fifo_t *p_fifo );
 void            aout_DestroyFifo        ( aout_fifo_t *p_fifo );