RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed to check that SNDCTL_DSP_CHANNELS actually grants the requested number of channels 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3320 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
steve 2001-12-04 17:54:08 +00:00
parent ede059fec2
commit d18cf2ade3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libao2/ao_oss.c
View File

@ -129,8 +129,9 @@ static int init(int rate,int channels,int format,int flags){
// We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
ao_data.channels = channels;
if (ao_data.channels > 2) {
if (ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1) {
printf("audio_setup: Failed to set audio device to %d channels\n", ao_data.channels);
if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1 ||
ao_data.channels != channels ) {
printf("audio_setup: Failed to set audio device to %d channels\n", channels);
return 0;
}
}
@ -141,7 +142,7 @@ static int init(int rate,int channels,int format,int flags){
return 0;
}
}
printf("audio_setup: using %d channels (requested: %d)\n", ao_data.channels, ao_data.channels);
printf("audio_setup: using %d channels (requested: %d)\n", ao_data.channels, channels);
// set rate
ao_data.samplerate=rate;
ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);