diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-25 11:11:07 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-25 11:11:07 +0000 |
commit | 6dbf6b4df117ae2dcace55f7e592a20fb81795be (patch) | |
tree | cdd2b17b355d8f2973a4328fafed66612b5ef154 /mplayer.c | |
parent | fb3854d760b559816ed05c844188775129a3edf9 (diff) | |
download | mpv-6dbf6b4df117ae2dcace55f7e592a20fb81795be.tar.bz2 mpv-6dbf6b4df117ae2dcace55f7e592a20fb81795be.tar.xz |
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14819 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -950,9 +950,8 @@ static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) 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(sh_audio){ 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 @@ if(sh_audio){ 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); |