MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-12 07:23:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Align OSS with ALSA so that forked-daapd will start even when there is no sound device

Browse Source
This commit is contained in:
ejurgensen 2015-02-19 10:30:34 +01:00
parent 6382b11904
commit 02581f1aab
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/laudio_oss4.c
View File

@ -280,6 +280,7 @@ int
laudio_open(void) laudio_open(void)
{ {
audio_buf_info bi; audio_buf_info bi;
oss_sysinfo si;
int scratch; int scratch;
int ret; int ret;
@ -291,6 +292,14 @@ laudio_open(void)
return -1; return -1;
} }
ret = ioctl(oss_fd, SNDCTL_SYSINFO, &si);
if ((ret < 0) || (si.versionnum < 0x040000))
{
DPRINTF(E_LOG, L_LAUDIO, "Your OSS version (%s) is unavailable or too old; version 4.0.0+ is required\n", si.version);
goto out_fail;
}
scratch = 0; scratch = 0;
ret = ioctl(oss_fd, SNDCTL_DSP_SETTRIGGER, &scratch); ret = ioctl(oss_fd, SNDCTL_DSP_SETTRIGGER, &scratch);
if (ret < 0) if (ret < 0)
@ -390,41 +399,10 @@ laudio_close(void)
int int
laudio_init(laudio_status_cb cb) laudio_init(laudio_status_cb cb)
{ {
oss_sysinfo si;
int ret;
status_cb = cb; status_cb = cb;
pcm_status = LAUDIO_CLOSED;
card_name = cfg_getstr(cfg_getsec(cfg, "audio"), "card"); card_name = cfg_getstr(cfg_getsec(cfg, "audio"), "card");
oss_fd = open(card_name, O_RDWR);
if (oss_fd < 0)
{
DPRINTF(E_FATAL, L_LAUDIO, "Could not open sound device: %s\n", strerror(errno));
return -1;
}
ret = ioctl(oss_fd, SNDCTL_SYSINFO, &si);
close(oss_fd);
oss_fd = -1;
if (ret < 0)
{
DPRINTF(E_FATAL, L_LAUDIO, "Could not check OSS version: %s\n", strerror(errno));
return -1;
}
if (si.versionnum < 0x040000)
{
DPRINTF(E_FATAL, L_LAUDIO, "Your OSS version (%s) is too old; version 4.0.0+ is required\n", si.version);
return -1;
}
return 0; return 0;
} }