Mercurial > mplayer.hg
changeset 29801:7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
author | reimar |
---|---|
date | Fri, 06 Nov 2009 16:16:22 +0000 |
parents | 606c9da862b7 |
children | c2e91cf65729 |
files | mplayer.c |
diffstat | 1 files changed, 44 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Fri Nov 06 16:11:58 2009 +0000 +++ b/mplayer.c Fri Nov 06 16:16:22 2009 +0000 @@ -1606,63 +1606,63 @@ void reinit_audio_chain(void) { - if (!mpctx->sh_audio) - return; - current_module="init_audio_codec"; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); - if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){ - goto init_error; - } + if (!mpctx->sh_audio) + return; + current_module="init_audio_codec"; + mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); + if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){ + goto init_error; + } initialized_flags|=INITIALIZED_ACODEC; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); - - - current_module="af_preinit"; - ao_data.samplerate=force_srate; - ao_data.channels=0; - ao_data.format=audio_output_format; + mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); + + + current_module="af_preinit"; + ao_data.samplerate=force_srate; + ao_data.channels=0; + ao_data.format=audio_output_format; #if 1 - // first init to detect best values - if(!init_audio_filters(mpctx->sh_audio, // preliminary init - // input: - mpctx->sh_audio->samplerate, - // output: - &ao_data.samplerate, &ao_data.channels, &ao_data.format)){ - mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); - exit_player(EXIT_ERROR); - } + // first init to detect best values + if(!init_audio_filters(mpctx->sh_audio, // preliminary init + // input: + mpctx->sh_audio->samplerate, + // output: + &ao_data.samplerate, &ao_data.channels, &ao_data.format)){ + mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); + exit_player(EXIT_ERROR); + } #endif - current_module="ao2_init"; - mpctx->audio_out = init_best_audio_out(audio_driver_list, - 0, // plugin flag - ao_data.samplerate, - ao_data.channels, - ao_data.format,0); - if(!mpctx->audio_out){ - mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); - goto init_error; - } + current_module="ao2_init"; + mpctx->audio_out = init_best_audio_out(audio_driver_list, + 0, // plugin flag + ao_data.samplerate, + ao_data.channels, + ao_data.format, 0); + if(!mpctx->audio_out){ + mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); + goto init_error; + } initialized_flags|=INITIALIZED_AO; mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n", - mpctx->audio_out->info->short_name, - ao_data.samplerate, ao_data.channels, - af_fmt2str_short(ao_data.format), - af_fmt2bits(ao_data.format)/8 ); + mpctx->audio_out->info->short_name, + ao_data.samplerate, ao_data.channels, + af_fmt2str_short(ao_data.format), + af_fmt2bits(ao_data.format)/8 ); mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", - mpctx->audio_out->info->name, mpctx->audio_out->info->author); + mpctx->audio_out->info->name, mpctx->audio_out->info->author); if(strlen(mpctx->audio_out->info->comment) > 0) - mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", mpctx->audio_out->info->comment); + mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", mpctx->audio_out->info->comment); // init audio filters: #if 1 current_module="af_init"; if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) { - mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); - goto init_error; + mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); + goto init_error; } #endif - mpctx->mixer.audio_out = mpctx->audio_out; - mpctx->mixer.volstep = volstep; -return; + mpctx->mixer.audio_out = mpctx->audio_out; + mpctx->mixer.volstep = volstep; + return; init_error: uninit_player(INITIALIZED_ACODEC|INITIALIZED_AO); // close codec and possibly AO