sound: oxygen: fix input monitor control names
authorClemens Ladisch <clemens@ladisch.de>
Mon, 28 Sep 2009 09:22:18 +0000 (11:22 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Sep 2009 09:55:17 +0000 (11:55 +0200)
Insert "Playback" into the input monitor control names to prevent
alsa-lib from treating these controls as global controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/oxygen/oxygen_mixer.c

index 5dfb5fb..f375b8a 100644 (file)
@@ -805,7 +805,7 @@ static const struct {
                .controls = {
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Switch",
+                               .name = "Analog Input Monitor Playback Switch",
                                .info = snd_ctl_boolean_mono_info,
                                .get = monitor_get,
                                .put = monitor_put,
@@ -813,7 +813,7 @@ static const struct {
                        },
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Volume",
+                               .name = "Analog Input Monitor Playback Volume",
                                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                .info = monitor_volume_info,
@@ -830,7 +830,7 @@ static const struct {
                .controls = {
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Switch",
+                               .name = "Analog Input Monitor Playback Switch",
                                .info = snd_ctl_boolean_mono_info,
                                .get = monitor_get,
                                .put = monitor_put,
@@ -838,7 +838,7 @@ static const struct {
                        },
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Volume",
+                               .name = "Analog Input Monitor Playback Volume",
                                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                .info = monitor_volume_info,
@@ -855,7 +855,7 @@ static const struct {
                .controls = {
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Switch",
+                               .name = "Analog Input Monitor Playback Switch",
                                .index = 1,
                                .info = snd_ctl_boolean_mono_info,
                                .get = monitor_get,
@@ -864,7 +864,7 @@ static const struct {
                        },
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Analog Input Monitor Volume",
+                               .name = "Analog Input Monitor Playback Volume",
                                .index = 1,
                                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
@@ -882,7 +882,7 @@ static const struct {
                .controls = {
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Digital Input Monitor Switch",
+                               .name = "Digital Input Monitor Playback Switch",
                                .info = snd_ctl_boolean_mono_info,
                                .get = monitor_get,
                                .put = monitor_put,
@@ -890,7 +890,7 @@ static const struct {
                        },
                        {
                                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                               .name = "Digital Input Monitor Volume",
+                               .name = "Digital Input Monitor Playback Volume",
                                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                .info = monitor_volume_info,