# HG changeset patch # User henry # Date 1124999852 0 # Node ID 41278ab73e9b7a923fe71fefeba32c664373236f # Parent 03cd6abe5664565876ab1f65c5bf82ff65c4c2c5 set the nearest number of channels, return(0) upon errors diff -r 03cd6abe5664 -r 41278ab73e9b libao2/ao_alsa.c --- a/libao2/ao_alsa.c Thu Aug 25 19:46:20 2005 +0000 +++ b/libao2/ao_alsa.c Thu Aug 25 19:57:32 2005 +0000 @@ -548,13 +548,15 @@ { mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set format: %s\n", snd_strerror(err)); + return(0); } - if ((err = snd_pcm_hw_params_set_channels(alsa_handler, alsa_hwparams, - ao_data.channels)) < 0) + if ((err = snd_pcm_hw_params_set_channels_near(alsa_handler, alsa_hwparams, + &ao_data.channels)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set channels: %s\n", snd_strerror(err)); + return(0); } if ((err = snd_pcm_hw_params_set_rate_near(alsa_handler, alsa_hwparams,