encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netbsdaudio: Handle ioctls failing 

A user reported that the mpv video player hangs after attempting to
set an unsupported number of channels with the SDL audio output,
because it thinks it's successfully opened the device. This makes
the failure graceful.
This commit is contained in:
nia 2021-03-10 09:36:46 +01:00 committed by Sam Lantinga
parent 4fbd60b817
commit a5f3ea1448
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/netbsd/SDL_netbsdaudio.c
View File

@ -295,9 +295,13 @@ NETBSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
info.hiwat = 5; info.hiwat = 5;
info.lowat = 3; info.lowat = 3;
(void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info); if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) < 0) {
return SDL_SetError("AUDIO_SETINFO failed for %s: %s", devname, strerror(errno));
}
(void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info); if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) {
return SDL_SetError("AUDIO_GETINFO failed for %s: %s", devname, strerror(errno));
}
/* Final spec used for the device. */ /* Final spec used for the device. */
this->spec.format = format; this->spec.format = format;