X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Ffilters.c;h=2bf64e7ca8bf7eadefbdc5281a128ff9f7ec4f6e;hb=9f700867b29ee5c137c7c1b118eae35b7784c1fd;hp=9ffb5f14af0d6a91e33b019068218f15f4b07dc7;hpb=5a55a589848fa6c68395288ab2bb47b45695cb1e;p=vlc diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c index 9ffb5f14af..2bf64e7ca8 100644 --- a/src/audio_output/filters.c +++ b/src/audio_output/filters.c @@ -29,7 +29,7 @@ #endif #include -#include +#include #ifdef HAVE_ALLOCA_H # include @@ -58,7 +58,7 @@ static aout_filter_t * FindFilter( aout_instance_t * p_aout, memcpy( &p_filter->input, p_input_format, sizeof(audio_sample_format_t) ); memcpy( &p_filter->output, p_output_format, sizeof(audio_sample_format_t) ); - p_filter->p_module = module_need( p_filter, "audio filter", NULL, 0 ); + p_filter->p_module = module_need( p_filter, "audio filter", NULL, false ); if ( p_filter->p_module == NULL ) { vlc_object_detach( p_filter ); @@ -156,9 +156,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout, if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS ) { msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS ); - intf_UserFatal( p_aout, false, _("Audio filtering failed"), - _("The maximum number of filters (%d) was reached."), - AOUT_MAX_FILTERS ); + dialog_Fatal( p_aout, _("Audio filtering failed"), + _("The maximum number of filters (%d) was reached."), + AOUT_MAX_FILTERS ); return -1; } @@ -203,9 +203,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout, { ReleaseFilter( pp_filters[0] ); msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS ); - intf_UserFatal( p_aout, false, _("Audio filtering failed"), - _("The maximum number of filters (%d) was reached."), - AOUT_MAX_FILTERS ); + dialog_Fatal( p_aout, _("Audio filtering failed"), + _("The maximum number of filters (%d) was reached."), + AOUT_MAX_FILTERS ); return -1; } pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output, @@ -226,9 +226,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout, { ReleaseFilter( pp_filters[0] ); msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS ); - intf_UserFatal( p_aout, false, _("Audio filtering failed"), - _("The maximum number of filters (%d) was reached."), - AOUT_MAX_FILTERS ); + dialog_Fatal( p_aout, _("Audio filtering failed"), + _("The maximum number of filters (%d) was reached."), + AOUT_MAX_FILTERS ); return -1; } pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output, @@ -383,6 +383,7 @@ vout_thread_t *aout_filter_RequestVout( aout_filter_t *p_filter, { if( !p_filter->request_vout.pf_request_vout ) return NULL; - return p_filter->request_vout.pf_request_vout( p_filter->request_vout.p_private, p_vout, p_fmt ); + return p_filter->request_vout.pf_request_vout( p_filter->request_vout.p_private, + p_vout, p_fmt, true ); }