Replace remaining instances of aout_buffer_t with block_t

diff --git a/extras/analyser/vlc.vim b/extras/analyser/vlc.vim
index 0e9f869cbf7fe96102853e0ff73d6c865197b3cc..712d216e3bc0247032885219d24ebfc95999d119 100644 (file)
--- a/extras/analyser/vlc.vim
+++ b/extras/analyser/vlc.vim
@@ -53,7 +53,7 @@ function VlcSyntax()
   syn keyword cType es_format_t video_palette_t
   " Aout
   syn keyword cType audio_output_t aout_sys_t
-  syn keyword cType aout_fifo_t aout_input_t aout_buffer_t audio_sample_format_t
+  syn keyword cType aout_fifo_t aout_input_t audio_sample_format_t
   syn keyword cType aout_mixer_sys_t aout_filter_sys_t audio_volume_t
   syn keyword cType aout_mixer_t aout_output_t audio_date_t 
   syn keyword cType aout_filter_t

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index c537767ec71674174c201f2b386c4167c8da68a9..5829c493ef81c2ee7584c0f7add8ede77abea402 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -231,9 +231,9 @@ VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vo
 /** Audio output buffer FIFO */
 struct aout_fifo_t
 {
-    aout_buffer_t *         p_first;
-    aout_buffer_t **        pp_last;
-    date_t                  end_date;
+    block_t  *p_first;
+    block_t **pp_last;
+    date_t    end_date;
 };
 
 /* Legacy packet-oriented audio output helpers */

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index beac8fd83d01576098e0fde46deb093ef75ba63d..b9a89d4cc714e3893187bf78605f3a82d5483478 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -71,7 +71,7 @@ struct decoder_t
 
     /* */
     picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
-    aout_buffer_t *     ( * pf_decode_audio )( decoder_t *, block_t ** );
+    block_t *           ( * pf_decode_audio )( decoder_t *, block_t ** );
     subpicture_t *      ( * pf_decode_sub)   ( decoder_t *, block_t ** );
     block_t *           ( * pf_packetize )   ( decoder_t *, block_t ** );
 
@@ -110,7 +110,7 @@ struct decoder_t
 
     /* Audio output callbacks
      * XXX use decoder_NewAudioBuffer/decoder_DeleteAudioBuffer */
-    aout_buffer_t  *(*pf_aout_buffer_new)( decoder_t *, int );
+    block_t        *(*pf_aout_buffer_new)( decoder_t *, int );
 
     /* SPU output callbacks
      * XXX use decoder_NewSubpicture and decoder_DeleteSubpicture */
@@ -162,7 +162,7 @@ struct encoder_t
     es_format_t         fmt_out;
 
     block_t *           ( * pf_encode_video )( encoder_t *, picture_t * );
-    block_t *           ( * pf_encode_audio )( encoder_t *, aout_buffer_t * );
+    block_t *           ( * pf_encode_audio )( encoder_t *, block_t * );
     block_t *           ( * pf_encode_sub )( encoder_t *, subpicture_t * );
 
     /* Common encoder options */
@@ -209,7 +209,7 @@ VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * );
  * output buffer. You have to release it using decoder_DeleteAudioBuffer
  * or by returning it to the caller as a pf_decode_audio return value.
  */
-VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
+VLC_API block_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
 
 /**
  * This function will return a new subpicture usable by a decoder as an output

diff --git a/include/vlc_common.h b/include/vlc_common.h
index c04d6f3f24965af411afd7afd484c3d8b48f033e..6ca99279176a0fca6fac31ec5cd3bb43764d5917 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -273,7 +273,6 @@ typedef struct audio_output audio_output_t;
 typedef struct aout_sys_t aout_sys_t;
 typedef struct aout_fifo_t aout_fifo_t;
 typedef struct aout_input_t aout_input_t;
-typedef struct block_t aout_buffer_t;
 typedef audio_format_t audio_sample_format_t;
 
 /* Video */

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index a1db107fcba4b8490daefbebba055d5fc3ec827b..8c2fc63c429507fd258ce1a54d2b3d73ac25efd5 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -330,7 +330,7 @@ static int Init( vlc_object_t *p_this, struct filter_sys_t * p_data
  * DoWork: convert a buffer
  *****************************************************************************/
 static void DoWork( filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+                    block_t * p_in_buf, block_t * p_out_buf )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
     int i_input_nb = aout_FormatNbChannels( &p_filter->fmt_in.audio );

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 5e01479da75c5417baafdd19018249aeaf4ffbdb..d2b3690e1709f2570a20c2d07aac5e722d4ba32a 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -49,11 +49,9 @@ static void CloseFilter   ( vlc_object_t * );
 
 static block_t *Convert( filter_t *p_filter, block_t *p_block );
 
-static unsigned int stereo_to_mono( filter_t *, aout_buffer_t *,
-                                    aout_buffer_t * );
-static unsigned int mono( filter_t *, aout_buffer_t *, aout_buffer_t * );
-static void stereo2mono_downmix( filter_t *, aout_buffer_t *,
-                                 aout_buffer_t * );
+static unsigned int stereo_to_mono( filter_t *, block_t *, block_t * );
+static unsigned int mono( filter_t *, block_t *, block_t * );
+static void stereo2mono_downmix( filter_t *, block_t *, block_t * );
 
 /*****************************************************************************
  * Local structures
@@ -504,7 +502,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
  * Written by Boris Dorès <babal@via.ecp.fr>
  */
 static void stereo2mono_downmix( filter_t * p_filter,
-                            aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+                                 block_t * p_in_buf, block_t * p_out_buf )
 {
     filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
 
@@ -607,7 +605,7 @@ static void stereo2mono_downmix( filter_t * p_filter,
 
 /* Simple stereo to mono mixing. */
 static unsigned int mono( filter_t *p_filter,
-                          aout_buffer_t *p_output, aout_buffer_t *p_input )
+                          block_t *p_output, block_t *p_input )
 {
     filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
     int16_t *p_in, *p_out;
@@ -627,7 +625,7 @@ static unsigned int mono( filter_t *p_filter,
 
 /* Simple stereo to mono mixing. */
 static unsigned int stereo_to_mono( filter_t *p_filter,
-                                    aout_buffer_t *p_output, aout_buffer_t *p_input )
+                                    block_t *p_output, block_t *p_input )
 {
     filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
     int16_t *p_in, *p_out;

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index b48eede2467dbe6c28dcaad50794ea888b232cd3..0ad0b9c5619948263f12c76869e5607790584285 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -59,7 +59,7 @@ static block_t *Filter( filter_t *, block_t * );
  * DoWork: convert a buffer
  *****************************************************************************/
 static void DoWork( filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+                    block_t * p_in_buf, block_t * p_out_buf )
 {
     const unsigned i_input_physical = p_filter->fmt_in.audio.i_physical_channels;
 

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 8a44a145c749b6b2c48f1b3902d10d72f6750e7e..2d621501f9f8e61e6da2c44afcbddb3fb43cdd42 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -74,7 +74,7 @@ vlc_module_end ()
  * DoWork: decode an MPEG audio frame.
  *****************************************************************************/
 static void DoWork( filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+                    block_t * p_in_buf, block_t * p_out_buf )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
 

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index f148b33bb45f23f1583d250f5eed4236e4890682..0e52a64dd54fae7c8c2731cedb6f47ee14ffdf41 100644 (file)
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -39,7 +39,7 @@
  * Local prototypes
  *****************************************************************************/
 static int Create( vlc_object_t * );
-static void DoWork( audio_mixer_t *, aout_buffer_t *, float );
+static void DoWork( audio_mixer_t *, block_t *, float );
 
 /*****************************************************************************
  * Module descriptor
@@ -69,7 +69,7 @@ static int Create( vlc_object_t *p_this )
 /**
  * Mixes a new output buffer
  */
-static void DoWork( audio_mixer_t * p_mixer, aout_buffer_t *p_buffer,
+static void DoWork( audio_mixer_t * p_mixer, block_t *p_buffer,
                     float f_multiplier )
 {
     if( f_multiplier == 1.0 )

diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
index 7719e0631f30e3d0f61647135982ba6d2351755c..9ef9af3983744cb485237b0f1cc9e7dc7dfb6a54 100644 (file)
--- a/modules/audio_output/audioqueue.c
+++ b/modules/audio_output/audioqueue.c
@@ -136,9 +136,9 @@ static int Open ( vlc_object_t *p_this )
 /*****************************************************************************
   * aout_FifoPop : get the next buffer out of the FIFO
   *****************************************************************************/
-static aout_buffer_t *aout_FifoPop2( aout_fifo_t * p_fifo )
+static block_t *aout_FifoPop2( aout_fifo_t * p_fifo )
  {
-     aout_buffer_t *p_buffer = p_fifo->p_first;
+     block_t *p_buffer = p_fifo->p_first;
      if( p_buffer != NULL )
      {
          p_fifo->p_first = p_buffer->p_next;
@@ -167,7 +167,7 @@ static void Close ( vlc_object_t *p_this )
 
 void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer) {
     audio_output_t * p_aout = (audio_output_t *)inUserData;
-    aout_buffer_t *   p_buffer = NULL;
+    block_t *   p_buffer = NULL;
 
     if (p_aout) {
         struct aout_sys_t * p_sys = p_aout->sys;

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 9ae85884e2f9fcada90144b1d4d20fbc3e019d91..ee49456656e48048b6d39acb3a55907cfc8149a2 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1304,7 +1304,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
     while( i_mData_bytes < ioData->mBuffers[0].mDataByteSize )
     {
         /* We don't have enough data yet */
-        aout_buffer_t * p_buffer;
+        block_t * p_buffer;
         p_buffer = aout_PacketNext( p_aout, current_date );
 
         if( p_buffer != NULL )
@@ -1353,7 +1353,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
                                     const AudioTimeStamp * inOutputTime,
                                     void * threadGlobals )
 {
-    aout_buffer_t * p_buffer;
+    block_t * p_buffer;
     mtime_t         current_date;
 
     audio_output_t * p_aout = (audio_output_t *)threadGlobals;

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 9b14e5f2f9e9f520051275341b1ea17da26b8842..6069c246e8a34a23a66b83ed1abb46860e494e74 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -105,7 +105,7 @@ static int  CreateDSBuffer    ( audio_output_t *, int, int, int, int, int, bool
 static int  CreateDSBufferPCM ( audio_output_t *, vlc_fourcc_t*, int, int, int, bool );
 static void DestroyDSBuffer   ( audio_output_t * );
 static void* DirectSoundThread( void * );
-static int  FillBuffer        ( audio_output_t *, int, aout_buffer_t * );
+static int  FillBuffer        ( audio_output_t *, int, block_t * );
 
 static int ReloadDirectXDevices( vlc_object_t *, char const *,
                                 vlc_value_t, vlc_value_t, void * );
@@ -949,8 +949,7 @@ static void DestroyDSBuffer( audio_output_t *p_aout )
  *****************************************************************************
  * Returns VLC_SUCCESS on success.
  *****************************************************************************/
-static int FillBuffer( audio_output_t *p_aout, int i_frame,
-                       aout_buffer_t *p_buffer )
+static int FillBuffer( audio_output_t *p_aout, int i_frame, block_t *p_buffer )
 {
     aout_sys_t *p_sys = p_aout->sys;
     notification_thread_t *p_notif = &p_sys->notif;
@@ -1099,7 +1098,7 @@ static void* DirectSoundThread( void *data )
 
         for( i = 0; i < l_free_slots; i++ )
         {
-            aout_buffer_t *p_buffer = aout_PacketNext( p_aout,
+            block_t *p_buffer = aout_PacketNext( p_aout,
                 mtime + INT64_C(1000000) * (i * i_frame_siz + l_queued) /
                 p_aout->format.i_rate );
 

diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index 44399aec4a0563048c74ee6297d9fa879dce6f87..a2b243fc5fba4645f859752a1e1bcf0e081ae992 100644 (file)
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -263,7 +263,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
     mtime_t play_date = mdate() + (mtime_t) ( dtime );
 
     /* Get the next audio data buffer */
-    aout_buffer_t *p_buffer = aout_PacketNext( p_aout, play_date );
+    block_t *p_buffer = aout_PacketNext( p_aout, play_date );
 
     if( p_buffer != NULL )
     {

diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index f65b9c965f7025912f381f2224bf55678ddd9eb3..aae1b842a92e837cdd1e294ed73fade595e72f31 100644 (file)
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -284,7 +284,7 @@ static ULONG APIENTRY KaiCallback( PVOID p_cb_data,
                                    ULONG i_buf_size )
 {
     audio_output_t *p_aout = (audio_output_t *)p_cb_data;
-    aout_buffer_t  *p_aout_buffer;
+    block_t  *p_aout_buffer;
     mtime_t current_date, next_date;
     ULONG i_len;
 

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 67da43ed97a51135cf498f7b01193b66cf9ce15c..b6468090feb1595aed0bc7d6713298feb45ca69c 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -550,7 +550,7 @@ static mtime_t BufferDuration( audio_output_t * p_aout )
 
 typedef struct
 {
-    aout_buffer_t *p_buffer;
+    block_t *p_buffer;
     void          *p_bytes;
 } oss_thread_ctx_t;
 
@@ -574,7 +574,7 @@ static void* OSSThread( void *obj )
 
     for( ;; )
     {
-        aout_buffer_t * p_buffer = NULL;
+        block_t * p_buffer = NULL;
 
         int canc = vlc_savecancel ();
         if ( p_aout->format.i_format != VLC_CODEC_SPDIFL )

diff --git a/modules/audio_output/packet.c b/modules/audio_output/packet.c
index d88d129d32db7e4d32ad0087c7461c8a55200396..e890edcedf97583afca1da07520d6d7236fe4a28 100644 (file)
--- a/modules/audio_output/packet.c
+++ b/modules/audio_output/packet.c
@@ -41,7 +41,7 @@ static void aout_FifoInit( aout_fifo_t *p_fifo, uint32_t i_rate )
 /**
  * Pushes a packet into the FIFO.
  */
-static void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer )
+static void aout_FifoPush( aout_fifo_t * p_fifo, block_t * p_buffer )
 {
     *p_fifo->pp_last = p_buffer;
     p_fifo->pp_last = &p_buffer->p_next;
@@ -65,13 +65,13 @@ static void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer )
  */
 static void aout_FifoReset( aout_fifo_t * p_fifo )
 {
-    aout_buffer_t * p_buffer;
+    block_t * p_buffer;
 
     date_Set( &p_fifo->end_date, VLC_TS_INVALID );
     p_buffer = p_fifo->p_first;
     while ( p_buffer != NULL )
     {
-        aout_buffer_t * p_next = p_buffer->p_next;
+        block_t * p_next = p_buffer->p_next;
         block_Release( p_buffer );
         p_buffer = p_next;
     }
@@ -98,9 +98,9 @@ static void aout_FifoMoveDates( aout_fifo_t *fifo, mtime_t difference )
 /**
  * Gets the next buffer out of the FIFO
  */
-static aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo )
+static block_t *aout_FifoPop( aout_fifo_t * p_fifo )
 {
-    aout_buffer_t *p_buffer = p_fifo->p_first;
+    block_t *p_buffer = p_fifo->p_first;
     if( p_buffer != NULL )
     {
         p_fifo->p_first = p_buffer->p_next;
@@ -115,12 +115,12 @@ static aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo )
  */
 static void aout_FifoDestroy( aout_fifo_t * p_fifo )
 {
-    aout_buffer_t * p_buffer;
+    block_t * p_buffer;
 
     p_buffer = p_fifo->p_first;
     while ( p_buffer != NULL )
     {
-        aout_buffer_t * p_next = p_buffer->p_next;
+        block_t * p_next = p_buffer->p_next;
         block_Release( p_buffer );
         p_buffer = p_next;
     }
@@ -229,7 +229,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
     mtime_t start_date = date_Get( &exact_start_date );
 
     /* Check if there is enough data to slice a new buffer. */
-    aout_buffer_t *p_buffer = p_fifo->p_first;
+    block_t *p_buffer = p_fifo->p_first;
     if( p_buffer == NULL )
         return NULL;
 
@@ -266,7 +266,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
 
         for( uint8_t *p_out = p_buffer->p_buffer; needed > 0; )
         {
-            aout_buffer_t *p_inbuf = p_fifo->p_first;
+            block_t *p_inbuf = p_fifo->p_first;
             if( unlikely(p_inbuf == NULL) )
             {
                 msg_Err( p_aout, "packetization error" );

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 55b5172383bb0532a660c4c1cd24fe1c1b003e91..1f3f3e9c0426af6f48d66e5b1e4ea92ca1dd3ce9 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -63,7 +63,7 @@ static int OpenWaveOut   ( audio_output_t *, uint32_t,
 static int OpenWaveOutPCM( audio_output_t *, uint32_t,
                            vlc_fourcc_t*, int, int, int, bool );
 static int PlayWaveOut   ( audio_output_t *, HWAVEOUT, WAVEHDR *,
-                           aout_buffer_t *, bool );
+                           block_t *, bool );
 
 static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR );
 static void* WaveOutThread( void * );
@@ -738,8 +738,7 @@ static int OpenWaveOutPCM( audio_output_t *p_aout, uint32_t i_device_id,
  * PlayWaveOut: play a buffer through the WaveOut device
  *****************************************************************************/
 static int PlayWaveOut( audio_output_t *p_aout, HWAVEOUT h_waveout,
-                        WAVEHDR *p_waveheader, aout_buffer_t *p_buffer,
-                        bool b_spdif)
+                        WAVEHDR *p_waveheader, block_t *p_buffer, bool b_spdif)
 {
     MMRESULT result;
 
@@ -842,8 +841,8 @@ static int WaveOutClearDoneBuffers(aout_sys_t *p_sys)
         if( (p_waveheader[i].dwFlags & WHDR_DONE) &&
             p_waveheader[i].dwUser )
         {
-            aout_buffer_t *p_buffer =
-                    (aout_buffer_t *)(p_waveheader[i].dwUser);
+            block_t *p_buffer =
+                    (block_t *)(p_waveheader[i].dwUser);
             /* Unprepare and free the buffers which has just been played */
             waveOutUnprepareHeader( p_sys->h_waveout, &p_waveheader[i],
                                     sizeof(WAVEHDR) );
@@ -874,7 +873,7 @@ static void* WaveOutThread( void *data )
 {
     audio_output_t *p_aout = data;
     aout_sys_t *p_sys = p_aout->sys;
-    aout_buffer_t *p_buffer = NULL;
+    block_t *p_buffer = NULL;
     WAVEHDR *p_waveheader = p_sys->waveheader;
     int i, i_queued_frames;
     bool b_sleek;

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 320200e057e1f53695e81a8cf0c27ad0353ca9eb..21b7dcc93331b8971c97190086aa4385b6670b6a 100644 (file)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -91,9 +91,9 @@ struct decoder_sys_t
  ****************************************************************************/
 static block_t *DecodeBlock  ( decoder_t *, block_t ** );
 
-static uint8_t       *GetOutBuffer ( decoder_t *, block_t ** );
-static aout_buffer_t *GetAoutBuffer( decoder_t * );
-static block_t       *GetSoutBuffer( decoder_t * );
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
+static block_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
 
 /*****************************************************************************
  * OpenCommon: probe the decoder/packetizer and return score
@@ -367,7 +367,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
+        block_t *p_aout_buffer = GetAoutBuffer( p_dec );
         p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
         *pp_out_buffer = p_aout_buffer;
     }
@@ -378,11 +378,11 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
 /*****************************************************************************
  * GetAoutBuffer:
  *****************************************************************************/
-static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
+static block_t *GetAoutBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    aout_buffer_t *p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
+    block_t *p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
     if( p_buf )
     {
         p_buf->i_pts = date_Get( &p_sys->end_date );

diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index e34fe15408d4f5534c10ccaea3fe8adef5214950..284081ba9bcb777a8839ea4d194a0cf61cdb9ffc 100644 (file)
--- a/modules/codec/adpcm.c
+++ b/modules/codec/adpcm.c
@@ -41,7 +41,7 @@
 static int  OpenDecoder( vlc_object_t * );
 static void CloseDecoder( vlc_object_t * );
 
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
 
 vlc_module_begin ()
     set_description( N_("ADPCM audio decoder") )
@@ -264,7 +264,7 @@ static int OpenDecoder( vlc_object_t *p_this )
 /*****************************************************************************
  * DecodeBlock:
  *****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys  = p_dec->p_sys;
     block_t *p_block;
@@ -290,7 +290,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     if( p_block->i_buffer >= p_sys->i_block )
     {
-        aout_buffer_t *p_out;
+        block_t *p_out;
 
         p_out = decoder_NewAudioBuffer( p_dec, p_sys->i_samplesperblock );
         if( p_out == NULL )

diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c
index 5a395a7a3b4442aca573680b98f41fb9ee677f8a..4b07489fbc4deea592659e560f7bdc7c33df23f3 100644 (file)
--- a/modules/codec/aes3.c
+++ b/modules/codec/aes3.c
@@ -118,11 +118,11 @@ static void Close( vlc_object_t *p_this )
  ****************************************************************************
  * Beware, this function must be fed with complete frames (PES packet).
  *****************************************************************************/
-static aout_buffer_t *Decode( decoder_t *p_dec, block_t **pp_block )
+static block_t *Decode( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t       *p_block;
-    aout_buffer_t *p_aout_buffer;
+    block_t       *p_aout_buffer;
     int            i_frame_length, i_bits;
 
     p_block = Parse( p_dec, &i_frame_length, &i_bits, pp_block, false );

diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index 6ec7ab48fe1475c8ed2074b78b73978ec632d25a..81c6dc7682825fdd4a21d6097aa27722701a5110 100644 (file)
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -63,9 +63,9 @@ vlc_module_end ()
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
 #ifdef ENABLE_SOUT
-static block_t *EncoderEncode( encoder_t *, aout_buffer_t * );
+static block_t *EncoderEncode( encoder_t *, block_t * );
 #endif
 
 struct decoder_sys_t
@@ -342,7 +342,7 @@ static int DecoderOpen( vlc_object_t *p_this )
  ****************************************************************************
  * This function must be fed with whole samples (see nBlockAlign).
  ****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
@@ -1440,7 +1440,7 @@ static void EncoderClose ( vlc_object_t *p_this )
 /*****************************************************************************
  * EncoderEncode:
  *****************************************************************************/
-static block_t *EncoderEncode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *EncoderEncode( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_block = NULL;

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index c782bb9ffaf83db123f48e471a6e2c65ac4d2cc1..0c75a5d196e549bb08fd08acc31d14ef0cdc0a45 100644 (file)
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -225,11 +225,11 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
  * SplitBuffer: Needed because aout really doesn't like big audio chunk and
  * wma produces easily > 30000 samples...
  *****************************************************************************/
-static aout_buffer_t *SplitBuffer( decoder_t *p_dec )
+static block_t *SplitBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     int i_samples = __MIN( p_sys->i_samples, 4096 );
-    aout_buffer_t *p_buffer;
+    block_t *p_buffer;
 
     if( i_samples == 0 ) return NULL;
 
@@ -256,11 +256,11 @@ static aout_buffer_t *SplitBuffer( decoder_t *p_dec )
 /*****************************************************************************
  * DecodeAudio: Called to decode one frame
  *****************************************************************************/
-aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
+block_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     int i_used, i_output;
-    aout_buffer_t *p_buffer;
+    block_t *p_buffer;
     block_t *p_block;
     AVPacket pkt;
 

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 82196164981a2401f60831a262cd057731e93afc..a76d1e3eb3d62145bb4e20b00cdf0fb63938a159 100644 (file)
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -29,8 +29,8 @@ int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
                   vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
 void GetVlcAudioFormat( vlc_fourcc_t *, unsigned *pi_bits, int i_sample_fmt );
 
-picture_t * DecodeVideo    ( decoder_t *, block_t ** );
-aout_buffer_t * DecodeAudio( decoder_t *, block_t ** );
+picture_t * DecodeVideo( decoder_t *, block_t ** );
+block_t * DecodeAudio( decoder_t *, block_t ** );
 subpicture_t *DecodeSubtitle( decoder_t *p_dec, block_t ** );
 
 /* Video encoder module */

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index a96955e64b47bb582d070ef1a8fb0d3a963fa1ac..36cee2d49c1c1decff8c6e7829c3d8502b9508cb 100644 (file)
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -66,7 +66,7 @@ int  OpenEncoder ( vlc_object_t * );
 void CloseEncoder( vlc_object_t * );
 
 static block_t *EncodeVideo( encoder_t *, picture_t * );
-static block_t *EncodeAudio( encoder_t *, aout_buffer_t * );
+static block_t *EncodeAudio( encoder_t *, block_t * );
 
 struct thread_context_t;
 
@@ -1065,7 +1065,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 /****************************************************************************
  * EncodeAudio: the whole thing
  ****************************************************************************/
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
 

diff --git a/modules/codec/ddummy.c b/modules/codec/ddummy.c
index 3da60c0a436c90970e262998979bad439115dfeb..eaf71171815f5a748c8253c87a1480e1cbcf78c7 100644 (file)
--- a/modules/codec/ddummy.c
+++ b/modules/codec/ddummy.c
@@ -95,7 +95,7 @@ static int OpenDecoderCommon( vlc_object_t *p_this, bool b_force_dump )
     /* Set callbacks */
     p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
         DecodeBlock;
-    p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+    p_dec->pf_decode_audio = (block_t *(*)(decoder_t *, block_t **))
         DecodeBlock;
     p_dec->pf_decode_sub = (subpicture_t *(*)(decoder_t *, block_t **))
         DecodeBlock;

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 409dec9fe7340633c4653e6dc3f7b7b30154948f..dcc2b5fb00189d49689e32f1a4b14e506d51a5d0 100644 (file)
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -274,7 +274,7 @@ found:
     /* Set callbacks */
     p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
         DecodeBlock;
-    p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+    p_dec->pf_decode_audio = (block_t *(*)(decoder_t *, block_t **))
         DecodeBlock;
 
     vlc_mutex_init( &p_sys->lock );
@@ -979,7 +979,7 @@ static void *DecBlock( decoder_t *p_dec, block_t **pp_block )
     }
     else
     {
-        aout_buffer_t *p_aout_buffer;
+        block_t *p_aout_buffer;
         int i_samples = block_out.i_buffer /
             ( p_dec->fmt_out.audio.i_bitspersample *
               p_dec->fmt_out.audio.i_channels / 8 );
@@ -1094,7 +1094,7 @@ static int EncoderOpen( vlc_object_t *p_this )
     /* Set callbacks */
     p_enc->pf_encode_video = (block_t *(*)(encoder_t *, picture_t *))
         EncodeBlock;
-    p_enc->pf_encode_audio = (block_t *(*)(encoder_t *, aout_buffer_t *))
+    p_enc->pf_encode_audio = (block_t *(*)(encoder_t *, block_t *))
         EncodeBlock;
 
     return VLC_SUCCESS;
@@ -1543,7 +1543,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = (aout_buffer_t *)p_data;
+        block_t *p_aout_buffer = (block_t *)p_data;
         p_block_in = block_New( p_enc, p_aout_buffer->i_buffer );
         memcpy( p_block_in->p_buffer, p_aout_buffer->p_buffer,
                 p_block_in->i_buffer );

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index 4822065e328e3ec1dd554a9139ede7d01fff9b58..db837c067bfe40236afdc4d589da3e8f6ad8b4b5 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -102,9 +102,9 @@ static inline int SyncCode( const uint8_t * );
 static int  SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *,
                       unsigned int *, unsigned int *, unsigned int * );
 
-static uint8_t       *GetOutBuffer ( decoder_t *, block_t ** );
-static aout_buffer_t *GetAoutBuffer( decoder_t * );
-static block_t       *GetSoutBuffer( decoder_t * );
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
+static block_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder
@@ -388,7 +388,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
+        block_t *p_aout_buffer = GetAoutBuffer( p_dec );
         p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
         *pp_out_buffer = p_aout_buffer;
     }
@@ -399,10 +399,10 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
 /*****************************************************************************
  * GetAoutBuffer:
  *****************************************************************************/
-static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
+static block_t *GetAoutBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_buf;
+    block_t *p_buf;
 
     /* Hack for DTS S/PDIF filter which needs to send 3 frames at a time
      * (plus a few header bytes) */

diff --git a/modules/codec/edummy.c b/modules/codec/edummy.c
index 1e2c2a6f721f5e8b25e579577ec1e3f695df3159..237a940b8bcf3c0ceb65b0fe83fdc940c90636eb 100644 (file)
--- a/modules/codec/edummy.c
+++ b/modules/codec/edummy.c
@@ -48,7 +48,7 @@ vlc_module_end ()
  * Local prototypes
  *****************************************************************************/
 static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict );
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_buf );
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_buf );
 
 /*****************************************************************************
  * OpenDecoder: open the dummy encoder.
@@ -75,7 +75,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 /****************************************************************************
  * EncodeAudio: the whole thing
  ****************************************************************************/
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_buf )
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_buf )
 {
     VLC_UNUSED(p_enc); VLC_UNUSED(p_buf);
     return NULL;

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 47e0ebd9846d9c36645eee9c0fd0fe420c6938fc..d6e3dcb240d9ae6431dcaa725b906c83f168c8ed 100644 (file)
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -51,7 +51,7 @@ vlc_module_end ()
 /****************************************************************************
  * Local prototypes
  ****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
 static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * );
 
 #define MAX_CHANNEL_POSITIONS 9
@@ -199,7 +199,7 @@ static int Open( vlc_object_t *p_this )
 /*****************************************************************************
  * DecodeBlock:
  *****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t *p_block;
@@ -314,7 +314,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     {
         void *samples;
         faacDecFrameInfo frame;
-        aout_buffer_t *p_out;
+        block_t *p_out;
         int i, j;
 
         samples = faacDecDecode( p_sys->hfaad, &frame,

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index b52509561ff7d889887fc71e5c9b25482dcbeabc..8e0db1069927b125143bf7eee9f1882c965dc64a 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -56,8 +56,8 @@ struct decoder_sys_t
      * Input/Output properties
      */
     block_t *p_block;
-    aout_buffer_t *p_aout_buffer;
-    date_t        end_date;
+    block_t *p_aout_buffer;
+    date_t   end_date;
 
     /*
      * FLAC properties
@@ -96,7 +96,7 @@ static void CloseDecoder  ( vlc_object_t * );
 static int OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder ( vlc_object_t * );
 
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
 
 /*****************************************************************************
  * Module descriptor
@@ -523,7 +523,7 @@ static void decoder_state_error( decoder_t *p_dec,
 /****************************************************************************
  * DecodeBlock: the whole thing
  ****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
@@ -599,7 +599,7 @@ struct encoder_sys_t
 
 #define STREAMINFO_SIZE 38
 
-static block_t *Encode( encoder_t *, aout_buffer_t * );
+static block_t *Encode( encoder_t *, block_t * );
 
 /*****************************************************************************
  * EncoderWriteCallback: called by libflac to output encoded samples
@@ -743,7 +743,7 @@ static int OpenEncoder( vlc_object_t *p_this )
  ****************************************************************************
  * This function spits out ogg packets.
  ****************************************************************************/
-static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_chain;

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index bd3a33e4d632666a4c18afd26895af068bdf9efd..2e9066f02191e291539d417625f5fe8191e28a90 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -95,7 +95,7 @@ struct decoder_sys_t
 };
 
 
-static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block);
+static block_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block);
 
 
 static int Open (vlc_object_t *p_this)
@@ -195,11 +195,11 @@ static void Close (vlc_object_t *p_this)
 }
 
 
-static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
+static block_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
 {
     block_t *p_block;
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_out = NULL;
+    block_t *p_out = NULL;
 
     if (pp_block == NULL)
         return NULL;

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index a3745306046d5ef6deccc9e1b85893657dcea95c..8bf51a17172c897188c58c1ccc7f96d7a835b782 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -49,7 +49,7 @@ static void CloseCommon   ( vlc_object_t * );
 #ifdef ENABLE_SOUT
 static int  OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder  ( vlc_object_t * );
-static block_t *EncodeFrames( encoder_t *, aout_buffer_t * );
+static block_t *EncodeFrames( encoder_t *, block_t * );
 #endif
 
 vlc_module_begin ()
@@ -169,7 +169,7 @@ static int VobHeader( unsigned *pi_rate,
                       unsigned *pi_channels, unsigned *pi_original_channels,
                       unsigned *pi_bits,
                       const uint8_t *p_header );
-static void VobExtract( aout_buffer_t *, block_t *, unsigned i_bits );
+static void VobExtract( block_t *, block_t *, unsigned i_bits );
 /* */
 static int AobHeader( unsigned *pi_rate,
                       unsigned *pi_channels, unsigned *pi_layout,
@@ -177,7 +177,7 @@ static int AobHeader( unsigned *pi_rate,
                       unsigned *pi_padding,
                       aob_group_t g[2],
                       const uint8_t *p_header );
-static void AobExtract( aout_buffer_t *, block_t *, unsigned i_bits, aob_group_t p_group[2] );
+static void AobExtract( block_t *, block_t *, unsigned i_bits, aob_group_t p_group[2] );
 /* */
 static int BdHeader( unsigned *pi_rate,
                      unsigned *pi_channels,
@@ -185,7 +185,7 @@ static int BdHeader( unsigned *pi_rate,
                      unsigned *pi_original_channels,
                      unsigned *pi_bits,
                      const uint8_t *p_header );
-static void BdExtract( aout_buffer_t *, block_t *, unsigned, unsigned, unsigned, unsigned );
+static void BdExtract( block_t *, block_t *, unsigned, unsigned, unsigned, unsigned );
 
 
 /*****************************************************************************
@@ -387,7 +387,7 @@ static block_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
         }
 
         /* */
-        aout_buffer_t *p_aout_buffer;
+        block_t *p_aout_buffer;
         p_aout_buffer = decoder_NewAudioBuffer( p_dec, i_frame_length );
         if( !p_aout_buffer )
             return NULL;
@@ -505,7 +505,7 @@ static void CloseEncoder ( vlc_object_t *p_this )
 /*****************************************************************************
  * EncodeFrames: encode zero or more LCPM audio packets
  *****************************************************************************/
-static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *EncodeFrames( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_first_block = NULL, *p_last_block = NULL;
@@ -911,7 +911,7 @@ static int BdHeader( unsigned *pi_rate,
     return 0;
 }
 
-static void VobExtract( aout_buffer_t *p_aout_buffer, block_t *p_block,
+static void VobExtract( block_t *p_aout_buffer, block_t *p_block,
                         unsigned i_bits )
 {
     uint8_t *p_out = p_aout_buffer->p_buffer;
@@ -975,7 +975,7 @@ static void VobExtract( aout_buffer_t *p_aout_buffer, block_t *p_block,
         memcpy( p_out, p_block->p_buffer, p_block->i_buffer );
     }
 }
-static void AobExtract( aout_buffer_t *p_aout_buffer,
+static void AobExtract( block_t *p_aout_buffer,
                         block_t *p_block, unsigned i_bits, aob_group_t p_group[2] )
 {
     const unsigned i_channels = p_group[0].i_channels +
@@ -1033,7 +1033,7 @@ static void AobExtract( aout_buffer_t *p_aout_buffer,
 
     }
 }
-static void BdExtract( aout_buffer_t *p_aout_buffer, block_t *p_block,
+static void BdExtract( block_t *p_aout_buffer, block_t *p_block,
                        unsigned i_frame_length,
                        unsigned i_channels, unsigned i_channels_padding,
                        unsigned i_bits )

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 08dc775647532a6f7610724dbed5f5b4232447d8..daa0bfb7cc2cdea5feb62370de39cec677659199 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -75,9 +75,9 @@ struct decoder_sys_t
 
 /* This isn't the place to put mad-specific stuff. However, it makes the
  * mad plug-in's life much easier if we put 8 extra bytes at the end of the
- * buffer, because that way it doesn't have to copy the aout_buffer_t to a
- * bigger buffer. This has no implication on other plug-ins, and we only
- * lose 8 bytes per frame. --Meuuh */
+ * buffer, because that way it doesn't have to copy the block_t to a bigger
+ * buffer. This has no implication on other plug-ins, and we only lose 8 bytes
+ * per frame. --Meuuh */
 #define MAD_BUFFER_GUARD 8
 #define MPGA_HEADER_SIZE 4
 
@@ -89,9 +89,9 @@ static int  OpenPacketizer( vlc_object_t * );
 static void CloseDecoder  ( vlc_object_t * );
 static block_t *DecodeBlock  ( decoder_t *, block_t ** );
 
-static uint8_t       *GetOutBuffer ( decoder_t *, block_t ** );
-static aout_buffer_t *GetAoutBuffer( decoder_t * );
-static block_t       *GetSoutBuffer( decoder_t * );
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
+static block_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
 
 static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
                      unsigned int * pi_channels_conf,
@@ -516,7 +516,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
+        block_t *p_aout_buffer = GetAoutBuffer( p_dec );
         p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
         *pp_out_buffer = p_aout_buffer;
     }
@@ -527,10 +527,10 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
 /*****************************************************************************
  * GetAoutBuffer:
  *****************************************************************************/
-static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
+static block_t *GetAoutBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_buf;
+    block_t *p_buf;
 
     p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length );
     if( p_buf == NULL ) return NULL;

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index f28cd9d997879079d3b7d0663676708620176889..87e36c7e3d88c3dadb8a361e01eebf3f5bb3c6d3 100644 (file)
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -92,7 +92,7 @@ static int  OpenGeneric( vlc_object_t *, bool b_encode );
 static void CloseGeneric( vlc_object_t * );
 
 static picture_t *DecodeVideo( decoder_t *, block_t ** );
-static aout_buffer_t *DecodeAudio ( decoder_t *, block_t ** );
+static block_t *DecodeAudio ( decoder_t *, block_t ** );
 static block_t *EncodeVideo( encoder_t *, picture_t * );
 
 static OMX_ERRORTYPE OmxEventHandler( OMX_HANDLETYPE, OMX_PTR, OMX_EVENTTYPE,
@@ -1376,10 +1376,10 @@ reconfig:
 /*****************************************************************************
  * DecodeAudio: Called to decode one frame
  *****************************************************************************/
-aout_buffer_t *DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
+block_t *DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_buffer = 0;
+    block_t *p_buffer = NULL;
     OMX_BUFFERHEADERTYPE *p_header;
     OMX_ERRORTYPE omx_error;
     block_t *p_block;

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index b8e0f2de6522ce131af730acd32c21e1ce5036a4..c61ece890a8a6eb4b59857b527d980e4383add35 100644 (file)
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -78,7 +78,7 @@ vlc_module_end ()
 static int           OpenAudio( decoder_t * );
 static int           OpenVideo( decoder_t * );
 
-static aout_buffer_t *DecodeAudio( decoder_t *, block_t ** );
+static block_t       *DecodeAudio( decoder_t *, block_t ** );
 #ifndef WIN32
 static picture_t     *DecodeVideo( decoder_t *, block_t ** );
 #endif
@@ -523,7 +523,7 @@ exit_error:
 /*****************************************************************************
  * DecodeAudio:
  *****************************************************************************/
-static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
@@ -638,7 +638,7 @@ static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
 
     if( p_sys->i_out < p_sys->i_out_frames )
     {
-        aout_buffer_t *p_out;
+        block_t *p_out;
         int  i_frames = __MIN( p_sys->i_out_frames - p_sys->i_out, 1000 );
 
         p_out = decoder_NewAudioBuffer( p_dec, i_frames );

diff --git a/modules/codec/shine/shine_mod.c b/modules/codec/shine/shine_mod.c
index 8931bafc771411270746e64a6ffc627836eae20f..f9effe74c2821e009205a4828937b2b951f7b097 100644 (file)
--- a/modules/codec/shine/shine_mod.c
+++ b/modules/codec/shine/shine_mod.c
@@ -57,7 +57,7 @@ struct encoder_sys_t
 static int  OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder  ( vlc_object_t * );
 
-static block_t *EncodeFrame  ( encoder_t *, aout_buffer_t * );
+static block_t *EncodeFrame  ( encoder_t *, block_t * );
 
 vlc_module_begin();
     set_category( CAT_INPUT );
@@ -137,7 +137,7 @@ enomem:
 }
 
 /* We split/pack PCM blocks to a fixed size: pcm_chunk_size bytes */
-static block_t *GetPCM( encoder_t *p_enc, aout_buffer_t *p_block )
+static block_t *GetPCM( encoder_t *p_enc, block_t *p_block )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_pcm_block;
@@ -200,7 +200,7 @@ buffered:
     return block_FifoCount( p_sys->p_fifo ) > 0 ? block_FifoGet( p_sys->p_fifo ) : NULL;
 }
 
-static block_t *EncodeFrame( encoder_t *p_enc, aout_buffer_t *p_block )
+static block_t *EncodeFrame( encoder_t *p_enc, block_t *p_block )
 {
     block_t *p_pcm_block;
     block_t *p_chain = NULL;

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index 9cc430ab40e5f3ca8d63086a3e3ffad17ed16327..67d0b00a0b59ba7bfd79d4bb3eaed99bf123d462 100644 (file)
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -185,17 +185,17 @@ static const int pi_channels_maps[6] =
  ****************************************************************************/
 
 static block_t *DecodeBlock  ( decoder_t *, block_t ** );
-static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *, block_t **);
+static block_t *DecodeRtpSpeexPacket( decoder_t *, block_t **);
 static int  ProcessHeaders( decoder_t * );
 static int  ProcessInitialHeader ( decoder_t *, ogg_packet * );
 static void *ProcessPacket( decoder_t *, ogg_packet *, block_t ** );
 
-static aout_buffer_t *DecodePacket( decoder_t *, ogg_packet * );
+static block_t *DecodePacket( decoder_t *, ogg_packet * );
 static block_t *SendPacket( decoder_t *, block_t * );
 
 static void ParseSpeexComments( decoder_t *, ogg_packet * );
 
-static block_t *Encode   ( encoder_t *, aout_buffer_t * );
+static block_t *Encode   ( encoder_t *, block_t * );
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
@@ -555,7 +555,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
+        block_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
 
         if( p_block )
             block_Release( p_block );
@@ -563,11 +563,11 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     }
 }
 
-static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block )
 {
     block_t *p_speex_bit_block = *pp_block;
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_aout_buffer;
+    block_t *p_aout_buffer;
     int i_decode_ret;
     unsigned int i_speex_frame_size;
 
@@ -685,7 +685,7 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block
 /*****************************************************************************
  * DecodePacket: decodes a Speex packet.
  *****************************************************************************/
-static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
+static block_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
@@ -700,7 +700,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
     /* Decode one frame at a time */
     if( p_sys->i_frame_in_packet < p_sys->p_header->frames_per_packet )
     {
-        aout_buffer_t *p_aout_buffer;
+        block_t *p_aout_buffer;
         if( p_sys->p_header->frame_size == 0 )
             return NULL;
 
@@ -978,7 +978,7 @@ static int OpenEncoder( vlc_object_t *p_this )
  ****************************************************************************
  * This function spits out ogg packets.
  ****************************************************************************/
-static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_block, *p_chain = NULL;

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index cd07276c15eb9e8b24de9f2ec113343222cdd439..99390d79fc60c820cd4313fdf8cc78bfc214ea8a 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -44,7 +44,7 @@
  ****************************************************************************/
 static int OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder ( vlc_object_t * );
-static block_t *Encode   ( encoder_t *, aout_buffer_t * );
+static block_t *Encode   ( encoder_t *, block_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -258,7 +258,7 @@ static void Bufferize( encoder_t *p_enc, int16_t *p_in, int i_nb_samples )
                              * sizeof(int16_t) );
 }
 
-static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     int16_t *p_buffer = (int16_t *)p_aout_buf->p_buffer;

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index c7e2b82eec3237b4db3c85a3da22b48f5d2b4200..57380612a0fe8b10a850b3d76b9168994b4c7b6d 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -151,7 +151,7 @@ static block_t *DecodeBlock  ( decoder_t *, block_t ** );
 static int  ProcessHeaders( decoder_t * );
 static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
 
-static aout_buffer_t *DecodePacket  ( decoder_t *, ogg_packet * );
+static block_t *DecodePacket( decoder_t *, ogg_packet * );
 static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * );
 
 static void ParseVorbisComments( decoder_t * );
@@ -161,7 +161,7 @@ static void ConfigureChannelOrder(int *, int, uint32_t, bool );
 #ifdef HAVE_VORBIS_ENCODER
 static int OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder ( vlc_object_t * );
-static block_t *Encode   ( encoder_t *, aout_buffer_t * );
+static block_t *Encode   ( encoder_t *, block_t * );
 #endif
 
 /*****************************************************************************
@@ -460,7 +460,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     }
     else
     {
-        aout_buffer_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
+        block_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
         if( p_block )
             block_Release( p_block );
         return p_aout_buffer;
@@ -485,7 +485,7 @@ static void Interleave( INTERLEAVE_TYPE *p_out, const INTERLEAVE_TYPE **pp_in,
 /*****************************************************************************
  * DecodePacket: decodes a Vorbis packet.
  *****************************************************************************/
-static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
+static block_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     int           i_samples;
@@ -504,7 +504,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
     if( ( i_samples = vorbis_synthesis_pcmout( &p_sys->vd, &pp_pcm ) ) > 0 )
     {
 
-        aout_buffer_t *p_aout_buffer;
+        block_t *p_aout_buffer;
 
         p_aout_buffer =
             decoder_NewAudioBuffer( p_dec, i_samples );
@@ -841,7 +841,7 @@ static int OpenEncoder( vlc_object_t *p_this )
  ****************************************************************************
  * This function spits out ogg packets.
  ****************************************************************************/
-static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     ogg_packet oggpacket;

diff --git a/modules/codec/wmafixed/wma.c b/modules/codec/wmafixed/wma.c
index c452ef85b25bdca3d73b680e71082ece53a33d93..caa21de895b22d709ee7afb0d91cbbac659a3896 100644 (file)
--- a/modules/codec/wmafixed/wma.c
+++ b/modules/codec/wmafixed/wma.c
@@ -71,7 +71,7 @@ static unsigned int pi_channels_maps[7] =
 static int  OpenDecoder   ( vlc_object_t * );
 static void CloseDecoder  ( vlc_object_t * );
 
-static aout_buffer_t *DecodeFrame  ( decoder_t *, block_t ** );
+static block_t *DecodeFrame( decoder_t *, block_t ** );
 
 /*****************************************************************************
  * Module descriptor
@@ -89,11 +89,11 @@ vlc_module_end();
  * SplitBuffer: Needed because aout really doesn't like big audio chunk and
  * wma produces easily > 30000 samples...
  *****************************************************************************/
-static aout_buffer_t *SplitBuffer( decoder_t *p_dec )
+static block_t *SplitBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     unsigned int i_samples = __MIN( p_sys->i_samples, 2048 );
-    aout_buffer_t *p_buffer;
+    block_t *p_buffer;
 
     if( i_samples == 0 ) return NULL;
 
@@ -191,11 +191,11 @@ static int OpenDecoder( vlc_object_t *p_this )
 /*****************************************************************************
  * DecodeFrame: decodes a wma frame.
  *****************************************************************************/
-static aout_buffer_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     block_t       *p_block;
-    aout_buffer_t *p_aout_buffer = NULL;
+    block_t       *p_aout_buffer = NULL;
 
     if( !pp_block || !*pp_block ) return NULL;
 

diff --git a/modules/misc/stats/encoder.c b/modules/misc/stats/encoder.c
index 4b7461d17aa235d5a22f3cc4069172794976ccd3..84b5cd7aada33ed032fcc22ecf68852bd58c1a72 100644 (file)
--- a/modules/misc/stats/encoder.c
+++ b/modules/misc/stats/encoder.c
@@ -45,7 +45,7 @@ struct encoder_sys_t
  * Local prototypes
  *****************************************************************************/
 static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict );
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_abuff );
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_abuff );
 
 /*****************************************************************************
  * OpenDecoder: open the dummy encoder.
@@ -90,7 +90,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 /****************************************************************************
  * EncodeVideo: the whole thing
  ****************************************************************************/
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_abuff )
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_abuff )
 {
     (void)p_abuff;
     (void)p_enc;

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index fd234598c65377d9659b5647313feb4c2b471ab6..a041e065410e058da97b05edc893114da4a63e22 100644 (file)
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -45,7 +45,7 @@ static const int pi_channels_maps[6] =
      | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
 };
 
-static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
+static block_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
 {
     block_t *p_block;
     int i_size;

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index a5dd25b0586a578b0a5967a8f9a75884abb303cd..7f5f53a33b5870bd28b350fef8b3a6cff588e32c 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -140,7 +140,7 @@ int aout_FiltersCreatePipeline( vlc_object_t *, filter_t **, int *,
 #define aout_FiltersCreatePipeline(o, pv, pc, inf, outf) \
         aout_FiltersCreatePipeline(VLC_OBJECT(o), pv, pc, inf, outf)
 void aout_FiltersDestroyPipeline( filter_t *const *, unsigned );
-void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** );
+void aout_FiltersPlay( filter_t *const *, unsigned, block_t ** );
 
 /* From mixer.c : */
 #define aout_MixerNew(o, f) aout_MixerNew(VLC_OBJECT(o), f)
@@ -163,7 +163,7 @@ static inline void aout_ReplayGainInit(audio_replay_gain_t *restrict d,
 /* From output.c : */
 int aout_OutputNew( audio_output_t * p_aout,
                     const audio_sample_format_t * p_format );
-void aout_OutputPlay( audio_output_t * p_aout, aout_buffer_t * p_buffer );
+void aout_OutputPlay( audio_output_t * p_aout, block_t * p_buffer );
 void aout_OutputPause( audio_output_t * p_aout, bool, mtime_t );
 void aout_OutputFlush( audio_output_t * p_aout, bool );
 void aout_OutputDelete( audio_output_t * p_aout );

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index cdd923bc332bb378fd11b51aefd91303fca138ca..c7c2d7ac4a1662f00b44c7b7974af7d86ff1ced6 100644 (file)
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -44,7 +44,7 @@
 
 #include "aout_internal.h"
 
-static void inputDrop( aout_input_t *, aout_buffer_t * );
+static void inputDrop( aout_input_t *, block_t * );
 static void inputResamplingStop( aout_input_t *p_input );
 
 static int VisualizationCallback( vlc_object_t *, char const *,
@@ -547,7 +547,7 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
  * static functions
  *****************************************************************************/
 
-static void inputDrop( aout_input_t *p_input, aout_buffer_t *p_buffer )
+static void inputDrop( aout_input_t *p_input, block_t *p_buffer )
 {
     block_Release( p_buffer );
 

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 7704cebd9c78aa5fc5ad07c64c00161bd2885be3..f0949c0e3032db3fd75395d9fa0e99956ecd8d62 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -69,7 +69,7 @@ static void       DecoderFlushBuffering( decoder_t * );
 static void       DecoderUnsupportedCodec( decoder_t *, vlc_fourcc_t );
 
 /* Buffers allocation callbacks for the decoders */
-static aout_buffer_t *aout_new_buffer( decoder_t *, int );
+static block_t *aout_new_buffer( decoder_t *, int );
 
 static picture_t *vout_new_buffer( decoder_t * );
 static void vout_del_buffer( decoder_t *, picture_t * );
@@ -149,8 +149,8 @@ struct decoder_owner_sys_t
         subpicture_t  *p_subpic;
         subpicture_t  **pp_subpic_next;
 
-        aout_buffer_t *p_audio;
-        aout_buffer_t **pp_audio_next;
+        block_t *p_audio;
+        block_t **pp_audio_next;
 
         block_t       *p_block;
         block_t       **pp_block_next;
@@ -206,7 +206,7 @@ void decoder_UnlinkPicture( decoder_t *p_decoder, picture_t *p_picture )
     p_decoder->pf_picture_unlink( p_decoder, p_picture );
 }
 
-aout_buffer_t *decoder_NewAudioBuffer( decoder_t *p_decoder, int i_size )
+block_t *decoder_NewAudioBuffer( decoder_t *p_decoder, int i_size )
 {
     if( !p_decoder->pf_aout_buffer_new )
         return NULL;
@@ -1152,7 +1152,7 @@ static void DecoderWaitDate( decoder_t *p_dec,
                                i_deadline ) == 0 );
 }
 
-static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
+static void DecoderPlayAudio( decoder_t *p_dec, block_t *p_audio,
                               int *pi_played_sum, int *pi_lost_sum )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
@@ -1253,7 +1253,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
 static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
-    aout_buffer_t   *p_aout_buf;
+    block_t *p_aout_buf;
     int i_decoded = 0;
     int i_lost = 0;
     int i_played = 0;
@@ -1708,7 +1708,7 @@ static void DecoderFlushBuffering( decoder_t *p_dec )
     }
     while( p_owner->buffer.p_audio )
     {
-        aout_buffer_t *p_audio = p_owner->buffer.p_audio;
+        block_t *p_audio = p_owner->buffer.p_audio;
 
         p_owner->buffer.p_audio = p_audio->p_next;
         p_owner->buffer.i_count--;
@@ -2176,10 +2176,10 @@ static vout_thread_t *aout_request_vout( void *p_private,
     return p_vout;
 }
 
-static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
+static block_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
-    aout_buffer_t *p_buffer;
+    block_t *p_buffer;
 
     if( p_owner->p_aout
      && !AOUT_FMTS_IDENTICAL(&p_dec->fmt_out.audio, &p_owner->audio) )