[Mplayer-cvslog] CVS: main mplayer.c,1.654,1.655

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv1419

Modified Files:
	mplayer.c 
Log Message:
- restore old behaviour of -channels,-srate,-format
- disable audio if libaf init failed (to avoid sig11 in decoder)


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -r1.654 -r1.655
--- mplayer.c	18 Jan 2003 17:33:55 -0000	1.654
+++ mplayer.c	18 Jan 2003 19:08:42 -0000	1.655
@@ -1647,7 +1647,9 @@
   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 @@
 	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
   }