Commit 144ba0d1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout_FiltersCreatePipeline: use vlc_object rather than audio_output

parent 26b038f3
...@@ -135,8 +135,10 @@ block_t *aout_InputPlay( audio_output_t *p_aout, aout_input_t *p_input, ...@@ -135,8 +135,10 @@ block_t *aout_InputPlay( audio_output_t *p_aout, aout_input_t *p_input,
void aout_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input ); void aout_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input );
/* From filters.c : */ /* From filters.c : */
int aout_FiltersCreatePipeline( audio_output_t *, filter_t **, int *, int aout_FiltersCreatePipeline( vlc_object_t *, filter_t **, int *,
const audio_sample_format_t *, const audio_sample_format_t * ); const audio_sample_format_t *, const audio_sample_format_t * );
#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_FiltersDestroyPipeline( filter_t *const *, unsigned );
void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** ); void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** );
......
...@@ -49,14 +49,14 @@ block_t *aout_FilterBufferNew( filter_t *p_filter, int size ) ...@@ -49,14 +49,14 @@ block_t *aout_FilterBufferNew( filter_t *p_filter, int size )
/***************************************************************************** /*****************************************************************************
* FindFilter: find an audio filter for a specific transformation * FindFilter: find an audio filter for a specific transformation
*****************************************************************************/ *****************************************************************************/
static filter_t * FindFilter( audio_output_t * p_aout, static filter_t * FindFilter( vlc_object_t *obj,
const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_input_format,
const audio_sample_format_t * p_output_format ) const audio_sample_format_t * p_output_format )
{ {
static const char typename[] = "audio filter"; static const char typename[] = "audio filter";
filter_t * p_filter; filter_t * p_filter;
p_filter = vlc_custom_create( p_aout, sizeof(*p_filter), typename ); p_filter = vlc_custom_create( obj, sizeof(*p_filter), typename );
if ( p_filter == NULL ) return NULL; if ( p_filter == NULL ) return NULL;
...@@ -120,6 +120,7 @@ static int SplitConversion( const audio_sample_format_t *restrict infmt, ...@@ -120,6 +120,7 @@ static int SplitConversion( const audio_sample_format_t *restrict infmt,
return AOUT_FMTS_IDENTICAL( infmt, midfmt ) ? -1 : 0; return AOUT_FMTS_IDENTICAL( infmt, midfmt ) ? -1 : 0;
} }
#undef aout_FiltersCreatePipeline
/** /**
* Allocates audio format conversion filters * Allocates audio format conversion filters
* @param obj parent VLC object for new filters * @param obj parent VLC object for new filters
...@@ -129,7 +130,7 @@ static int SplitConversion( const audio_sample_format_t *restrict infmt, ...@@ -129,7 +130,7 @@ static int SplitConversion( const audio_sample_format_t *restrict infmt,
* @param outfmt output audio format * @param outfmt output audio format
* @return 0 on success, -1 on failure * @return 0 on success, -1 on failure
*/ */
int aout_FiltersCreatePipeline( audio_output_t *obj, int aout_FiltersCreatePipeline( vlc_object_t *obj,
filter_t **filters, filter_t **filters,
int *nb_filters, int *nb_filters,
const audio_sample_format_t *restrict infmt, const audio_sample_format_t *restrict infmt,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment