Commit fb920b7d authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela

[ALSA] oxygen: rename PCM to Master

Rename the 'PCM Playback Volume'/'Switch' mixer controls to 'Master'.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 39516103
...@@ -524,7 +524,7 @@ static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0); ...@@ -524,7 +524,7 @@ static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
static const struct snd_kcontrol_new controls[] = { static const struct snd_kcontrol_new controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Volume", .name = "Master 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 = dac_volume_info, .info = dac_volume_info,
...@@ -536,7 +536,7 @@ static const struct snd_kcontrol_new controls[] = { ...@@ -536,7 +536,7 @@ static const struct snd_kcontrol_new controls[] = {
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Switch", .name = "Master Playback Switch",
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = dac_mute_get, .get = dac_mute_get,
.put = dac_mute_put, .put = dac_mute_put,
...@@ -637,7 +637,7 @@ int oxygen_mixer_init(struct oxygen *chip) ...@@ -637,7 +637,7 @@ int oxygen_mixer_init(struct oxygen *chip)
ctl = snd_ctl_new1(&controls[i], chip); ctl = snd_ctl_new1(&controls[i], chip);
if (!ctl) if (!ctl)
return -ENOMEM; return -ENOMEM;
if (!strcmp(ctl->id.name, "PCM Playback Volume")) if (!strcmp(ctl->id.name, "Master Playback Volume"))
ctl->tlv.p = chip->model->dac_tlv; ctl->tlv.p = chip->model->dac_tlv;
else if (chip->model->cd_in_from_video_in && else if (chip->model->cd_in_from_video_in &&
!strncmp(ctl->id.name, "CD Capture ", 11)) !strncmp(ctl->id.name, "CD Capture ", 11))
......
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