diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-09-28 05:22:18 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-28 05:55:17 -0400 |
| commit | 62428f7b8c873d43be8201e66392c3aad82fec93 (patch) | |
| tree | 4078eb399b04f309aab8b2fd15f5c233f14f84d5 | |
| parent | 1ff048869eb8e8408856e23b3dc6af094491f837 (diff) | |
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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 5dfb5fb73381..f375b8a27862 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
| @@ -805,7 +805,7 @@ static const struct { | |||
| 805 | .controls = { | 805 | .controls = { |
| 806 | { | 806 | { |
| 807 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 807 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 808 | .name = "Analog Input Monitor Switch", | 808 | .name = "Analog Input Monitor Playback Switch", |
| 809 | .info = snd_ctl_boolean_mono_info, | 809 | .info = snd_ctl_boolean_mono_info, |
| 810 | .get = monitor_get, | 810 | .get = monitor_get, |
| 811 | .put = monitor_put, | 811 | .put = monitor_put, |
| @@ -813,7 +813,7 @@ static const struct { | |||
| 813 | }, | 813 | }, |
| 814 | { | 814 | { |
| 815 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 815 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 816 | .name = "Analog Input Monitor Volume", | 816 | .name = "Analog Input Monitor Playback Volume", |
| 817 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 817 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 818 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | 818 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, |
| 819 | .info = monitor_volume_info, | 819 | .info = monitor_volume_info, |
| @@ -830,7 +830,7 @@ static const struct { | |||
| 830 | .controls = { | 830 | .controls = { |
| 831 | { | 831 | { |
| 832 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 832 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 833 | .name = "Analog Input Monitor Switch", | 833 | .name = "Analog Input Monitor Playback Switch", |
| 834 | .info = snd_ctl_boolean_mono_info, | 834 | .info = snd_ctl_boolean_mono_info, |
| 835 | .get = monitor_get, | 835 | .get = monitor_get, |
| 836 | .put = monitor_put, | 836 | .put = monitor_put, |
| @@ -838,7 +838,7 @@ static const struct { | |||
| 838 | }, | 838 | }, |
| 839 | { | 839 | { |
| 840 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 840 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 841 | .name = "Analog Input Monitor Volume", | 841 | .name = "Analog Input Monitor Playback Volume", |
| 842 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 842 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 843 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | 843 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, |
| 844 | .info = monitor_volume_info, | 844 | .info = monitor_volume_info, |
| @@ -855,7 +855,7 @@ static const struct { | |||
| 855 | .controls = { | 855 | .controls = { |
| 856 | { | 856 | { |
| 857 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 857 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 858 | .name = "Analog Input Monitor Switch", | 858 | .name = "Analog Input Monitor Playback Switch", |
| 859 | .index = 1, | 859 | .index = 1, |
| 860 | .info = snd_ctl_boolean_mono_info, | 860 | .info = snd_ctl_boolean_mono_info, |
| 861 | .get = monitor_get, | 861 | .get = monitor_get, |
| @@ -864,7 +864,7 @@ static const struct { | |||
| 864 | }, | 864 | }, |
| 865 | { | 865 | { |
| 866 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 866 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 867 | .name = "Analog Input Monitor Volume", | 867 | .name = "Analog Input Monitor Playback Volume", |
| 868 | .index = 1, | 868 | .index = 1, |
| 869 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 869 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 870 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | 870 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, |
| @@ -882,7 +882,7 @@ static const struct { | |||
| 882 | .controls = { | 882 | .controls = { |
| 883 | { | 883 | { |
| 884 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 884 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 885 | .name = "Digital Input Monitor Switch", | 885 | .name = "Digital Input Monitor Playback Switch", |
| 886 | .info = snd_ctl_boolean_mono_info, | 886 | .info = snd_ctl_boolean_mono_info, |
| 887 | .get = monitor_get, | 887 | .get = monitor_get, |
| 888 | .put = monitor_put, | 888 | .put = monitor_put, |
| @@ -890,7 +890,7 @@ static const struct { | |||
| 890 | }, | 890 | }, |
| 891 | { | 891 | { |
| 892 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 892 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 893 | .name = "Digital Input Monitor Volume", | 893 | .name = "Digital Input Monitor Playback Volume", |
| 894 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 894 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 895 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | 895 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, |
| 896 | .info = monitor_volume_info, | 896 | .info = monitor_volume_info, |