mirror of https://github.com/ericonr/sndio.git
Expose sun mixer master knobs in the top-level group.
This allows the same master knobs to be available no matter if sndiod is running or net.
This commit is contained in:
parent
9bec976a73
commit
b62a7eef6f
|
@ -224,7 +224,6 @@ scanvol(struct sioctl_sun_hdl *hdl, struct volume *vol)
|
||||||
int i, val;
|
int i, val;
|
||||||
|
|
||||||
memset(&desc, 0, sizeof(struct sioctl_desc));
|
memset(&desc, 0, sizeof(struct sioctl_desc));
|
||||||
strlcpy(desc.group, "hw", SIOCTL_NAMEMAX);
|
|
||||||
if (vol->level_idx >= 0) {
|
if (vol->level_idx >= 0) {
|
||||||
ctrl.dev = vol->level_idx;
|
ctrl.dev = vol->level_idx;
|
||||||
ctrl.type = AUDIO_MIXER_VALUE;
|
ctrl.type = AUDIO_MIXER_VALUE;
|
||||||
|
|
|
@ -51,8 +51,7 @@ struct fileops dev_sioctl_ops = {
|
||||||
void
|
void
|
||||||
dev_sioctl_ondesc(void *arg, struct sioctl_desc *desc, int val)
|
dev_sioctl_ondesc(void *arg, struct sioctl_desc *desc, int val)
|
||||||
{
|
{
|
||||||
#define GROUP_PREFIX "dev"
|
#define GROUP_PREFIX "hw"
|
||||||
#define GROUP_PREFIX_LEN (sizeof(GROUP_PREFIX))
|
|
||||||
char group_buf[CTL_NAMEMAX], *group;
|
char group_buf[CTL_NAMEMAX], *group;
|
||||||
struct dev *d = arg;
|
struct dev *d = arg;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
@ -64,13 +63,14 @@ dev_sioctl_ondesc(void *arg, struct sioctl_desc *desc, int val)
|
||||||
dev_rmctl(d, addr);
|
dev_rmctl(d, addr);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* prefix group names we use (top-level and "app") with "dev."
|
* prefix group names we use (top-level and "app") with "hw."
|
||||||
* to ensure that all controls have unique names when multiple
|
* to ensure that all controls have unique names when multiple
|
||||||
* sndiod's are chained
|
* sndiod's are chained
|
||||||
*/
|
*/
|
||||||
if (desc->group[0] == 0)
|
if (desc->group[0] == 0)
|
||||||
group = GROUP_PREFIX;
|
group = GROUP_PREFIX;
|
||||||
else if (strcmp(desc->group, "app") == 0) {
|
else if (strcmp(desc->group, GROUP_PREFIX) == 0 ||
|
||||||
|
strcmp(desc->group, "app") == 0) {
|
||||||
group = group_buf;
|
group = group_buf;
|
||||||
len = snprintf(group_buf, CTL_NAMEMAX,
|
len = snprintf(group_buf, CTL_NAMEMAX,
|
||||||
GROUP_PREFIX ".%s", desc->group);
|
GROUP_PREFIX ".%s", desc->group);
|
||||||
|
|
Loading…
Reference in New Issue