Use hardcoded rsnd/0 as openbsd default (hardware) device

This commit is contained in:
Alexandre Ratchov 2020-04-30 17:41:37 +02:00
parent 8d24dd3ef8
commit 7433055e88
3 changed files with 6 additions and 10 deletions

View File

@ -62,7 +62,7 @@ sio_open(const char *str, unsigned int mode, int nbio)
if (hdl != NULL)
return hdl;
#if defined(USE_SUN)
return _sio_sun_open("rsnd/default", mode, nbio);
return _sio_sun_open("rsnd/0", mode, nbio);
#elif defined(USE_OSS)
return _sio_oss_open("rsnd/default", mode, nbio);
#elif defined(USE_ALSA)

View File

@ -290,14 +290,10 @@ sio_sun_getfd(const char *str, unsigned int mode, int nbio)
DPRINTF("sio_sun_getfd: %s: '/' expected\n", str);
return -1;
}
if (strcmp(p, "default") == 0) {
devnum = 0;
} else {
p = _sndio_parsenum(p, &devnum, 255);
if (p == NULL || *p != '\0') {
DPRINTF("sio_sun_getfd: %s: number expected after '/'\n", str);
return -1;
}
p = _sndio_parsenum(p, &devnum, 255);
if (p == NULL || *p != '\0') {
DPRINTF("sio_sun_getfd: %s: number expected after '/'\n", str);
return -1;
}
snprintf(path, sizeof(path), DEVPATH_PREFIX "%u", devnum);
if (mode == (SIO_PLAY | SIO_REC))

View File

@ -45,7 +45,7 @@ sioctl_open(const char *str, unsigned int mode, int nbio)
if (hdl != NULL)
return hdl;
#if defined(USE_SUN_MIXER)
return _sioctl_sun_open("rsnd/default", mode, nbio);
return _sioctl_sun_open("rsnd/0", mode, nbio);
#else
return NULL;
#endif