aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:16:22 +0000
committerGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:16:22 +0000
commitb963af59f1d30704c2e47979bfe9d544eadc0d6b (patch)
tree9a82d49f8ad0b16171b145caf0b914be485e4af8
parent89c9b3b769e0affe2fa6d176440d85aa3d62a680 (diff)
Whitespace cosmetics: reindent reinit_audio_chain function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29843 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/mplayer.c b/mplayer.c
index 277cb5f3d1..87f5b0b6ab 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1606,63 +1606,63 @@ static void update_osd_msg(void) {
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");
+ 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;
+ 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);
- }
-#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;
- }
+ // 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;
+ }
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