[MPlayer-cvslog] CVS: main mplayer.c,1.834,1.835

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv10026

Modified Files:
	mplayer.c 
Log Message:
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- mplayer.c	25 Feb 2005 04:30:53 -0000	1.834
+++ mplayer.c	25 Feb 2005 11:11:07 -0000	1.835
@@ -950,9 +950,8 @@
     playback_speed = (float)new_srate / (float)sh_audio->samplerate;
   }
   result =  init_audio_filters(sh_audio, new_srate,
-           sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
+           sh_audio->channels, sh_audio->sample_format,
            ao_data->samplerate, ao_data->channels, ao_data->format,
-           af_fmt2bits(ao_data->format) / 8, /* ao_data.bps, */
            ao_data->outburst * 4, ao_data->buffersize);
   mixer.afilter = sh_audio->afilter;
 #ifdef HAVE_NEW_GUI
@@ -2119,16 +2118,10 @@
   if(!preinit_audio_filters(sh_audio,
         // input:
         (int)(sh_audio->samplerate*playback_speed),
-	sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
+	sh_audio->channels, sh_audio->sample_format,
 	// output:
-	&ao_data.samplerate, &ao_data.channels, &ao_data.format,
-	af_fmt2bits(ao_data.format)/8)){
+	&ao_data.samplerate, &ao_data.channels, &ao_data.format)){
       mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
-  } else {
-    char buf[128];
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"AF_pre: %dHz %dch %s\n",
-      ao_data.samplerate, ao_data.channels,
-      af_fmt2str(ao_data.format, buf, 128));
   }
 #endif  
   current_module="ao2_init";
@@ -2143,12 +2136,11 @@
     sh_audio=d_audio->sh=NULL; // -> nosound
   } else {
     // SUCCESS:
-    char buf[128];
     inited_flags|=INITED_AO;
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bps)\n",
       audio_out->info->short_name,
       ao_data.samplerate, ao_data.channels,
-      af_fmt2str(ao_data.format, buf, 128),
+      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",
       audio_out->info->name, audio_out->info->author);