Commit 62428f7b authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

sound: oxygen: fix input monitor control names

Insert "Playback" into the input monitor control names to prevent
alsa-lib from treating these controls as global controls.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1ff04886
...@@ -805,7 +805,7 @@ static const struct { ...@@ -805,7 +805,7 @@ static const struct {
.controls = { .controls = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch", .name = "Analog Input Monitor Playback Switch",
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = monitor_get, .get = monitor_get,
.put = monitor_put, .put = monitor_put,
...@@ -813,7 +813,7 @@ static const struct { ...@@ -813,7 +813,7 @@ static const struct {
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume", .name = "Analog Input Monitor Playback Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ, SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info, .info = monitor_volume_info,
...@@ -830,7 +830,7 @@ static const struct { ...@@ -830,7 +830,7 @@ static const struct {
.controls = { .controls = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch", .name = "Analog Input Monitor Playback Switch",
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = monitor_get, .get = monitor_get,
.put = monitor_put, .put = monitor_put,
...@@ -838,7 +838,7 @@ static const struct { ...@@ -838,7 +838,7 @@ static const struct {
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume", .name = "Analog Input Monitor Playback Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ, SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info, .info = monitor_volume_info,
...@@ -855,7 +855,7 @@ static const struct { ...@@ -855,7 +855,7 @@ static const struct {
.controls = { .controls = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch", .name = "Analog Input Monitor Playback Switch",
.index = 1, .index = 1,
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = monitor_get, .get = monitor_get,
...@@ -864,7 +864,7 @@ static const struct { ...@@ -864,7 +864,7 @@ static const struct {
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume", .name = "Analog Input Monitor Playback Volume",
.index = 1, .index = 1,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ, SNDRV_CTL_ELEM_ACCESS_TLV_READ,
...@@ -882,7 +882,7 @@ static const struct { ...@@ -882,7 +882,7 @@ static const struct {
.controls = { .controls = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Input Monitor Switch", .name = "Digital Input Monitor Playback Switch",
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = monitor_get, .get = monitor_get,
.put = monitor_put, .put = monitor_put,
...@@ -890,7 +890,7 @@ static const struct { ...@@ -890,7 +890,7 @@ static const struct {
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Input Monitor Volume", .name = "Digital Input Monitor Playback Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ, SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info, .info = monitor_volume_info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment