From d3ed2c8a6461deae52a59bc1612b3828bafad86a Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sat, 19 Jul 2008 13:23:57 +0200 Subject: [PATCH] Use block_Release instead of pf_release directly. --- modules/audio_filter/channel_mixer/headphone.c | 7 ++++--- modules/audio_filter/channel_mixer/mono.c | 6 +++--- modules/audio_filter/channel_mixer/simple.c | 7 ++++--- modules/audio_filter/converter/a52tofloat32.c | 7 ++++--- modules/audio_filter/converter/dtstofloat32.c | 7 ++++--- modules/audio_filter/converter/mpgatofixed32.c | 7 ++++--- modules/audio_filter/format.c | 16 ++++++++-------- modules/audio_filter/resampler/linear.c | 7 ++++--- 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index b57876a5c4..992541410b 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -669,7 +669,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -681,7 +682,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - if( p_block ) p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -709,6 +710,6 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; - if( p_block ) p_block->pf_release( p_block ); + block_Release( p_block ); return p_out; } diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 5948f05223..4c285b37c7 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -471,7 +471,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { if( p_block ) - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -482,7 +482,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } p_out->i_samples = (p_block->i_samples / p_filter->p_sys->i_nb_channels) * @@ -529,7 +529,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_out; } diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c index f95ce67f46..7fa42580da 100644 --- a/modules/audio_filter/channel_mixer/simple.c +++ b/modules/audio_filter/channel_mixer/simple.c @@ -233,7 +233,8 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -245,7 +246,7 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -269,7 +270,7 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block ) DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf ); - p_block->pf_release( p_block ); + block_Release( p_block ); p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c index 895d7d8318..c78633e950 100644 --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -473,7 +473,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -485,7 +486,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -512,7 +513,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_out; } diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index cc103e65b5..074c49c36b 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -431,7 +431,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -443,7 +444,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -470,7 +471,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_out; } diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 1e2a773095..5e8de153d5 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -365,7 +365,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -377,7 +378,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -402,7 +403,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf ); - p_block->pf_release( p_block ); + block_Release( p_block ); p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c index e2eb38a8ed..78c8b02f22 100644 --- a/modules/audio_filter/format.c +++ b/modules/audio_filter/format.c @@ -355,7 +355,7 @@ static block_t *S24toFloat32( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -424,7 +424,7 @@ static block_t *S16toFloat32( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -457,7 +457,7 @@ static block_t *U16toFloat32( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -497,7 +497,7 @@ static block_t *S16toS24( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -632,7 +632,7 @@ static block_t *S8toU16( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -663,7 +663,7 @@ static block_t *U8toS16( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -695,7 +695,7 @@ static block_t *S8toS16( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } @@ -726,7 +726,7 @@ static block_t *U8toU16( filter_t *p_filter, block_t *p_block ) p_block_out->i_length = p_block->i_length; p_block_out->i_rate = p_block->i_rate; - p_block->pf_release( p_block ); + block_Release( p_block ); return p_block_out; } diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c index badd99eafb..ea339b59b2 100644 --- a/modules/audio_filter/resampler/linear.c +++ b/modules/audio_filter/resampler/linear.c @@ -319,7 +319,8 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block ) if( !p_block || !p_block->i_samples ) { - if( p_block ) p_block->pf_release( p_block ); + if( p_block ) + block_Release( p_block ); return NULL; } @@ -333,7 +334,7 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block ) if( !p_out ) { msg_Warn( p_filter, "can't get output buffer" ); - p_block->pf_release( p_block ); + block_Release( p_block ); return NULL; } @@ -356,7 +357,7 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block ) DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf ); - p_block->pf_release( p_block ); + block_Release( p_block ); p_out->i_buffer = out_buf.i_nb_bytes; p_out->i_samples = out_buf.i_nb_samples; -- 2.39.2