diff options
| author | Ingo Bürk <admin@airblader.de> | 2018-03-27 09:26:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 09:26:55 +0200 |
| commit | 4345fa9d9715a912c55828565783311e3fab4f0f (patch) | |
| tree | 7a370fcf9448ef002710110959d41bdc2acbcfce /src | |
| parent | 9212ee658bb977557f65f569336417a74f7c4edc (diff) | |
| parent | 279e2fccf4c3bf48edd6a0ac68778ec235831599 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/first_network_device.c | 1 | ||||
| -rw-r--r-- | src/print_volume.c | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/first_network_device.c b/src/first_network_device.c index 430f1d5..b930f53 100644 --- a/src/first_network_device.c +++ b/src/first_network_device.c @@ -127,6 +127,7 @@ static net_type_t iface_type(const char *ifname) { return NET_TYPE_OTHER; #endif + return NET_TYPE_OTHER; } const char *first_eth_interface(const net_type_t type) { diff --git a/src/print_volume.c b/src/print_volume.c index 51e84f3..be6a1d7 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -211,6 +211,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * #if defined(__OpenBSD__) int oclass_idx = -1, master_idx = -1, master_mute_idx = -1; + int master_next = AUDIO_MIXER_LAST; mixer_devinfo_t devinfo, devinfo2; mixer_ctrl_t vinfo; @@ -228,12 +229,17 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * devinfo2.index = 0; while (ioctl(mixfd, AUDIO_MIXER_DEVINFO, &devinfo2) >= 0) { - if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) == 0)) + if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) == 0)) { master_idx = devinfo2.index; + master_next = devinfo2.next; + } if ((devinfo2.type == AUDIO_MIXER_ENUM) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmute, MAX_AUDIO_DEV_LEN) == 0)) - master_mute_idx = devinfo2.index; + if (master_next == devinfo2.index) + master_mute_idx = devinfo2.index; + if (master_next != AUDIO_MIXER_LAST) + master_next = devinfo2.next; devinfo2.index++; } @@ -246,6 +252,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * vinfo.dev = master_idx; vinfo.type = AUDIO_MIXER_VALUE; + vinfo.un.value.num_channels = devinfo.un.v.num_channels; if (ioctl(mixfd, AUDIO_MIXER_READ, &vinfo) == -1) goto out; |