diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-04 16:42:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 08:43:42 +0100 |
| commit | c30aa7b24282c6c544f25f360131fceb646927e4 (patch) | |
| tree | b1da236fb6df50dd8be84af255956289e0a781d8 /sound/pci/hda/hda_generic.h | |
| parent | ALSA: hda - Correct aamix output paths (diff) | |
| download | linux-c30aa7b24282c6c544f25f360131fceb646927e4.tar.xz linux-c30aa7b24282c6c544f25f360131fceb646927e4.zip | |
ALSA: hda - Add Loopback Mixing control
For codecs that have individual routes going through a loopback mixer
(like VIA codecs), we need to provide an explicit switch to choose
whether the output goes through mixer or directly from DAC.
This patch adds the check for such paths and creates "Loopback Mixing"
enum control when available.
It won't influence on codecs like Realtek or others where the loopback
mixer is connected independently from the primary output routes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index ba8de12b7125..d4a8f6c4e7a9 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -134,6 +134,7 @@ struct hda_gen_spec { int out_paths[AUTO_CFG_MAX_OUTS]; int hp_paths[AUTO_CFG_MAX_OUTS]; int speaker_paths[AUTO_CFG_MAX_OUTS]; + int aamix_out_paths[3]; int digout_paths[AUTO_CFG_MAX_OUTS]; int loopback_paths[HDA_MAX_NUM_INPUTS]; int digin_path; @@ -169,6 +170,9 @@ struct hda_gen_spec { unsigned int indep_hp:1; /* independent HP supported */ unsigned int indep_hp_enabled:1; /* independent HP enabled */ + /* loopback mixing mode */ + bool aamix_mode; + /* for virtual master */ hda_nid_t vmaster_nid; struct hda_vmaster_mute_hook vmaster_mute; |