Replace remaining call sites of aout_BufferFree()

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 870d77f0aae6a7d2a3e77f5e68af6cdd1797312e..c537767ec71674174c201f2b386c4167c8da68a9 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -125,8 +125,6 @@ typedef int32_t vlc_fixed_t;
  * Main audio output structures
  *****************************************************************************/
 
-#define aout_BufferFree( buffer ) block_Release( buffer )
-
 /* Size of a frame for S/PDIF output. */
 #define AOUT_SPDIF_SIZE 6144
 

diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
index f427a5fcfbe2bde8d90f309fa0b591e6cb5aa448..7719e0631f30e3d0f61647135982ba6d2351755c 100644 (file)
--- a/modules/audio_output/audioqueue.c
+++ b/modules/audio_output/audioqueue.c
@@ -184,7 +184,7 @@ void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferR
     if ( p_buffer != NULL ) {
         vlc_memcpy( inBuffer->mAudioData, p_buffer->p_buffer, p_buffer->i_buffer );
         inBuffer->mAudioDataByteSize = p_buffer->i_buffer;
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
     } else {
         vlc_memset( inBuffer->mAudioData, 0, inBuffer->mAudioDataBytesCapacity );
         inBuffer->mAudioDataByteSize = inBuffer->mAudioDataBytesCapacity;

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 09e92936e248b00ed7584fe68b9170037f0ad634..9ae85884e2f9fcada90144b1d4d20fbc3e019d91 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1321,7 +1321,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
                 vlc_memcpy( p_sys->p_remainder_buffer,
                             &p_buffer->p_buffer[i_second_mData_bytes],
                             p_sys->i_total_bytes );
-                aout_BufferFree( p_buffer );
+                block_Release( p_buffer );
                 break;
             }
             else
@@ -1330,7 +1330,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
                 current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->format.i_rate ) *
                                 ( i_second_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->format )  ); // 4 is fl32 specific
             }
-            aout_BufferFree( p_buffer );
+            block_Release( p_buffer );
         }
         else
         {
@@ -1382,7 +1382,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
 
         /* move data into output data buffer */
         vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer );
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
     }
     else
     {

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index fa0b4d2f37218ea0b792a56f9f705ca7e0c4057d..9b14e5f2f9e9f520051275341b1ea17da26b8842 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -984,7 +984,7 @@ static int FillBuffer( audio_output_t *p_aout, int i_frame,
     if( dsresult != DS_OK )
     {
         msg_Warn( p_aout, "cannot lock buffer" );
-        if( p_buffer ) aout_BufferFree( p_buffer );
+        if( p_buffer ) block_Release( p_buffer );
         return VLC_EGENERIC;
     }
 
@@ -1003,7 +1003,7 @@ static int FillBuffer( audio_output_t *p_aout, int i_frame,
         }
 
         vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
     }
 
     /* Now the data has been copied, unlock the buffer */

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 0b731a25397f8ce92941df961e0c30cc4a8b9f6b..d36870166177ff682757372b8c2fadf3797384b8 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -322,5 +322,5 @@ static void Play( audio_output_t * p_aout, block_t *p_buffer )
         p_aout->sys->waveh.DataLength += p_buffer->i_buffer;
     }
 
-    aout_BufferFree( p_buffer );
+    block_Release( p_buffer );
 }

diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index 86ffd2e09ecf4f20ad0bebf209b161c06f78f94f..44399aec4a0563048c74ee6297d9fa879dce6f87 100644 (file)
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -300,9 +300,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
     }
 
     if( p_buffer )
-    {
-        aout_BufferFree( p_buffer );
-    }
+        block_Release( p_buffer );
     return 0;
 }
 

diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index 199f71805aef279fb8376d1dd93c165644c53172..f65b9c965f7025912f381f2224bf55678ddd9eb3 100644 (file)
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -326,7 +326,7 @@ static ULONG APIENTRY KaiCallback( PVOID p_cb_data,
 
             next_date += p_aout_buffer->i_length;
 
-            aout_BufferFree( p_aout_buffer );
+            block_Release( p_aout_buffer );
         }
         else
         {

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index b4ec37328cdf397ca1b389db87c08d075605c412..67da43ed97a51135cf498f7b01193b66cf9ce15c 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -558,7 +558,7 @@ static void OSSThreadCleanup( void *data )
 {
     oss_thread_ctx_t *p_ctx = data;
     if( p_ctx->p_buffer )
-        aout_BufferFree( p_ctx->p_buffer );
+        block_Release( p_ctx->p_buffer );
     else
         free( p_ctx->p_bytes );
 }

diff --git a/modules/audio_output/packet.c b/modules/audio_output/packet.c
index b1d4dc17e9a2b0004700ae1a226ac1c7c8d89ac6..d88d129d32db7e4d32ad0087c7461c8a55200396 100644 (file)
--- a/modules/audio_output/packet.c
+++ b/modules/audio_output/packet.c
@@ -72,7 +72,7 @@ static void aout_FifoReset( aout_fifo_t * p_fifo )
     while ( p_buffer != NULL )
     {
         aout_buffer_t * p_next = p_buffer->p_next;
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
         p_buffer = p_next;
     }
     p_fifo->p_first = NULL;
@@ -121,7 +121,7 @@ static void aout_FifoDestroy( aout_fifo_t * p_fifo )
     while ( p_buffer != NULL )
     {
         aout_buffer_t * p_next = p_buffer->p_next;
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
         p_buffer = p_next;
     }
 
@@ -294,7 +294,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
             needed -= avail;
             p_out += avail;
             /* Next buffer */
-            aout_BufferFree( aout_FifoPop( p_fifo ) );
+            block_Release( aout_FifoPop( p_fifo ) );
         }
     }
     else

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index e2f18afc14dddd77d95428f02a0f4c26fea9de21..55b5172383bb0532a660c4c1cd24fe1c1b003e91 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -849,7 +849,7 @@ static int WaveOutClearDoneBuffers(aout_sys_t *p_sys)
                                     sizeof(WAVEHDR) );
 
             if( p_waveheader[i].dwUser != 1 )
-                aout_BufferFree( p_buffer );
+                block_Release( p_buffer );
 
             p_waveheader[i].dwUser = 0;
         }

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2ca232475b37097adf05d844b1c8edae6e7772bb..1f9985b2ecc3dd0ceeb12d1ffc53e40b556580e1 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -271,7 +271,7 @@ block_t *aout_DecNewBuffer (audio_output_t *aout, size_t samples)
 void aout_DecDeleteBuffer (audio_output_t *aout, block_t *block)
 {
     (void) aout;
-    aout_BufferFree (block);
+    block_Release (block);
 }
 
 /*****************************************************************************
@@ -296,7 +296,7 @@ int aout_DecPlay (audio_output_t *p_aout, block_t *p_buffer, int i_input_rate)
     if (unlikely(input == NULL)) /* can happen due to restart */
     {
         aout_unlock( p_aout );
-        aout_BufferFree( p_buffer );
+        block_Release( p_buffer );
         return -1;
     }
 

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 228132b0f8489a1c21f3899bc45b202530513d1e..cdd923bc332bb378fd11b51aefd91303fca138ca 100644 (file)
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -549,7 +549,7 @@ block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input,
 
 static void inputDrop( aout_input_t *p_input, aout_buffer_t *p_buffer )
 {
-    aout_BufferFree( p_buffer );
+    block_Release( p_buffer );
 
     p_input->i_buffer_lost++;
 }

diff --git a/src/input/decoder.c b/src/input/decoder.c
index b68df6f17deb8e8dec61bff13f9e30a5325c5069..7704cebd9c78aa5fc5ad07c64c00161bd2885be3 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1163,7 +1163,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
     {
         msg_Warn( p_dec, "non-dated audio buffer received" );
         *pi_lost_sum += 1;
-        aout_BufferFree( p_audio );
+        block_Release( p_audio );
         return;
     }
 
@@ -1239,7 +1239,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
         {
             msg_Dbg( p_dec, "discarded audio buffer" );
             *pi_lost_sum += 1;
-            aout_BufferFree( p_audio );
+            block_Release( p_audio );
         }
 
         if( !b_has_more )
@@ -1713,7 +1713,7 @@ static void DecoderFlushBuffering( decoder_t *p_dec )
         p_owner->buffer.p_audio = p_audio->p_next;
         p_owner->buffer.i_count--;
 
-        aout_BufferFree( p_audio );
+        block_Release( p_audio );
 
         if( !p_owner->buffer.p_audio )
             p_owner->buffer.pp_audio_next = &p_owner->buffer.p_audio;