From 1886b41ebf02def478fd2893ec7d529e137c56ea Mon Sep 17 00:00:00 2001 From: arpi Date: Sat, 18 Jan 2003 19:08:42 +0000 Subject: [PATCH] - restore old behaviour of -channels,-srate,-format - disable audio if libaf init failed (to avoid sig11 in decoder) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8997 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mplayer.c b/mplayer.c index 55a2cf38cd..de8a780712 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1647,7 +1647,9 @@ if(sh_audio){ current_module="ao2_init"; if(!(audio_out=init_best_audio_out(audio_driver_list, (ao_plugin_cfg.plugin_list!=NULL), // plugin flag - ao_data.samplerate, ao_data.channels, ao_data.format,0))){ + force_srate?force_srate:ao_data.samplerate, + audio_output_channels?audio_output_channels:ao_data.channels, + audio_output_format?audio_output_format:ao_data.format,0))){ // FAILED: mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); uninit_player(INITED_ACODEC); // close codec @@ -1673,9 +1675,9 @@ if(sh_audio){ ao_data.samplerate, ao_data.channels, ao_data.format, audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */ ao_data.outburst*4, ao_data.buffersize)){ - mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n"); -// uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao -// sh_audio=d_audio->sh=NULL; // -> nosound + mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); + uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao + sh_audio=d_audio->sh=NULL; // -> nosound } #endif }