diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-21 06:44:38 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-21 06:44:38 -0400 |
| commit | 6a9a6f233baad76b67a448b39bb55fc064755ba4 (patch) | |
| tree | 71557def09bb57e2a05d20e939d4824fbad59093 /Documentation/sound | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
| parent | 1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/SB-Live-mixer.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sound/alsa/SB-Live-mixer.txt b/Documentation/sound/alsa/SB-Live-mixer.txt index f5639d40521d..f4b5988f450c 100644 --- a/Documentation/sound/alsa/SB-Live-mixer.txt +++ b/Documentation/sound/alsa/SB-Live-mixer.txt | |||
| @@ -87,14 +87,14 @@ accumulator. ALSA uses accumulators 0 and 1 for left and right PCM. | |||
| 87 | The result is forwarded to the ADC capture FIFO (thus to the standard capture | 87 | The result is forwarded to the ADC capture FIFO (thus to the standard capture |
| 88 | PCM device). | 88 | PCM device). |
| 89 | 89 | ||
| 90 | name='Music Playback Volume',index=0 | 90 | name='Synth Playback Volume',index=0 |
| 91 | 91 | ||
| 92 | This control is used to attenuate samples for left and right MIDI FX-bus | 92 | This control is used to attenuate samples for left and right MIDI FX-bus |
| 93 | accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples. | 93 | accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples. |
| 94 | The result samples are forwarded to the front DAC PCM slots of the AC97 codec. | 94 | The result samples are forwarded to the front DAC PCM slots of the AC97 codec. |
| 95 | 95 | ||
| 96 | name='Music Capture Volume',index=0 | 96 | name='Synth Capture Volume',index=0 |
| 97 | name='Music Capture Switch',index=0 | 97 | name='Synth Capture Switch',index=0 |
| 98 | 98 | ||
| 99 | These controls are used to attenuate samples for left and right MIDI FX-bus | 99 | These controls are used to attenuate samples for left and right MIDI FX-bus |
| 100 | accumulator. ALSA uses accumulators 4 and 5 for left and right PCM. | 100 | accumulator. ALSA uses accumulators 4 and 5 for left and right PCM. |