From 6338c068a2f85dce3b4dee4c89c2047c8dbe5be2 Mon Sep 17 00:00:00 2001 From: uau Date: Thu, 1 Nov 2007 06:52:28 +0000 Subject: Simplify init_audio_filters() arguments Remove the following arguments as redundant: in_channels, in_format, out_minsize, out_maxsize. The first two always equal fields of the sh_audio_t struct given as the first argument to the function. The last two are unused after the allocation of sh_audio->a_out_buffer was changed to be done on demand. After the out_minsize and out_maxsize arguments are removed the function preinit_audio_filters() is identical to init_audio_filters(), so remove it and use the latter instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24922 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 205864a254..ad9f3d7231 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1213,9 +1213,7 @@ int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) playback_speed = (float)new_srate / (float)sh_audio->samplerate; } result = init_audio_filters(sh_audio, new_srate, - sh_audio->channels, sh_audio->sample_format, - &ao_data->samplerate, &ao_data->channels, &ao_data->format, - ao_data->outburst * 4, ao_data->buffersize); + &ao_data->samplerate, &ao_data->channels, &ao_data->format); mpctx->mixer.afilter = sh_audio->afilter; #ifdef HAVE_NEW_GUI if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter); @@ -1495,10 +1493,9 @@ if(mpctx->sh_audio){ ao_data.format=audio_output_format; #if 1 // first init to detect best values - if(!preinit_audio_filters(mpctx->sh_audio, + if(!init_audio_filters(mpctx->sh_audio, // preliminary init // input: (int)(mpctx->sh_audio->samplerate*playback_speed), - mpctx->sh_audio->channels, mpctx->sh_audio->sample_format, // output: &ao_data.samplerate, &ao_data.channels, &ao_data.format)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); -- cgit v1.2.3