projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From: Takashi Iwai <tiwai@suse.de> |
| 2 | Subject: ALSA: powermac - Rename mic-analog loopback mixer element | |
| 3 | Patch-mainline: | |
| 4 | References: bnc#444194 | |
| 5 | ||
| 6 | PCM Playback Volume:1 is actually assigned to a mic loopback volume | |
| 7 | on iBook G4. Let's rename it. | |
| 8 | ||
| 9 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 10 | ||
| 11 | --- | |
| 12 | sound/ppc/tumbler.c | 3 ++- | |
| 13 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 14 | ||
| 15 | --- a/sound/ppc/tumbler.c | |
| 16 | +++ b/sound/ppc/tumbler.c | |
| 17 | @@ -879,7 +879,8 @@ static struct snd_kcontrol_new snapper_m | |
| 18 | .put = tumbler_put_master_switch | |
| 19 | }, | |
| 20 | DEFINE_SNAPPER_MIX("PCM Playback Volume", 0, VOL_IDX_PCM), | |
| 21 | - DEFINE_SNAPPER_MIX("PCM Playback Volume", 1, VOL_IDX_PCM2), | |
| 22 | + /* Alternative PCM is assigned to Mic analog loopback on iBook G4 */ | |
| 23 | + DEFINE_SNAPPER_MIX("Mic Playback Volume", 0, VOL_IDX_PCM2), | |
| 24 | DEFINE_SNAPPER_MIX("Monitor Mix Volume", 0, VOL_IDX_ADC), | |
| 25 | DEFINE_SNAPPER_MONO("Tone Control - Bass", bass), | |
| 26 | DEFINE_SNAPPER_MONO("Tone Control - Treble", treble), |