diff options
author | Giuliano Pochini <pochini@shiny.it> | 2009-03-15 16:33:55 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-16 03:38:00 -0400 |
commit | 4c55bb0149b604901e4989d1ee0fddc53df8eb0c (patch) | |
tree | 493318bd0f70c8f8840ee2f1d7886a15ecfcdf4b /sound/pci/echoaudio | |
parent | 9f5d790d1b0af8e3705df12fd5d49a1df2a45c47 (diff) |
ALSA: echoaudio: remove line-out volume from vmixer cards
With this patch the drivers do not set the vmixer volume anymore at startup
because it is actually the output volume of the voices and ALSA mandates
that the volume must be 0 by default.
Signed-off-by: Giuliano Pochini <pochini@shiny.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/echoaudio')
-rw-r--r-- | sound/pci/echoaudio/indigo_dsp.c | 12 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigodj_dsp.c | 12 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigoio_dsp.c | 12 | ||||
-rw-r--r-- | sound/pci/echoaudio/mia_dsp.c | 12 |
4 files changed, 0 insertions, 48 deletions
diff --git a/sound/pci/echoaudio/indigo_dsp.c b/sound/pci/echoaudio/indigo_dsp.c index f05e39f7aad9..0b2cd9c86277 100644 --- a/sound/pci/echoaudio/indigo_dsp.c +++ b/sound/pci/echoaudio/indigo_dsp.c | |||
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
63 | if ((err = init_line_levels(chip)) < 0) | 63 | if ((err = init_line_levels(chip)) < 0) |
64 | return err; | 64 | return err; |
65 | 65 | ||
66 | /* Default routing of the virtual channels: all vchannels are routed | ||
67 | to the stereo output */ | ||
68 | set_vmixer_gain(chip, 0, 0, 0); | ||
69 | set_vmixer_gain(chip, 1, 1, 0); | ||
70 | set_vmixer_gain(chip, 0, 2, 0); | ||
71 | set_vmixer_gain(chip, 1, 3, 0); | ||
72 | set_vmixer_gain(chip, 0, 4, 0); | ||
73 | set_vmixer_gain(chip, 1, 5, 0); | ||
74 | set_vmixer_gain(chip, 0, 6, 0); | ||
75 | set_vmixer_gain(chip, 1, 7, 0); | ||
76 | err = update_vmixer_level(chip); | ||
77 | |||
78 | DE_INIT(("init_hw done\n")); | 66 | DE_INIT(("init_hw done\n")); |
79 | return err; | 67 | return err; |
80 | } | 68 | } |
diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c index 90730a5ecb42..08392916691e 100644 --- a/sound/pci/echoaudio/indigodj_dsp.c +++ b/sound/pci/echoaudio/indigodj_dsp.c | |||
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
63 | if ((err = init_line_levels(chip)) < 0) | 63 | if ((err = init_line_levels(chip)) < 0) |
64 | return err; | 64 | return err; |
65 | 65 | ||
66 | /* Default routing of the virtual channels: vchannels 0-3 and | ||
67 | vchannels 4-7 are routed to real channels 0-4 */ | ||
68 | set_vmixer_gain(chip, 0, 0, 0); | ||
69 | set_vmixer_gain(chip, 1, 1, 0); | ||
70 | set_vmixer_gain(chip, 2, 2, 0); | ||
71 | set_vmixer_gain(chip, 3, 3, 0); | ||
72 | set_vmixer_gain(chip, 0, 4, 0); | ||
73 | set_vmixer_gain(chip, 1, 5, 0); | ||
74 | set_vmixer_gain(chip, 2, 6, 0); | ||
75 | set_vmixer_gain(chip, 3, 7, 0); | ||
76 | err = update_vmixer_level(chip); | ||
77 | |||
78 | DE_INIT(("init_hw done\n")); | 66 | DE_INIT(("init_hw done\n")); |
79 | return err; | 67 | return err; |
80 | } | 68 | } |
diff --git a/sound/pci/echoaudio/indigoio_dsp.c b/sound/pci/echoaudio/indigoio_dsp.c index a7e09ec21079..0604c8a85223 100644 --- a/sound/pci/echoaudio/indigoio_dsp.c +++ b/sound/pci/echoaudio/indigoio_dsp.c | |||
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
63 | if ((err = init_line_levels(chip)) < 0) | 63 | if ((err = init_line_levels(chip)) < 0) |
64 | return err; | 64 | return err; |
65 | 65 | ||
66 | /* Default routing of the virtual channels: all vchannels are routed | ||
67 | to the stereo output */ | ||
68 | set_vmixer_gain(chip, 0, 0, 0); | ||
69 | set_vmixer_gain(chip, 1, 1, 0); | ||
70 | set_vmixer_gain(chip, 0, 2, 0); | ||
71 | set_vmixer_gain(chip, 1, 3, 0); | ||
72 | set_vmixer_gain(chip, 0, 4, 0); | ||
73 | set_vmixer_gain(chip, 1, 5, 0); | ||
74 | set_vmixer_gain(chip, 0, 6, 0); | ||
75 | set_vmixer_gain(chip, 1, 7, 0); | ||
76 | err = update_vmixer_level(chip); | ||
77 | |||
78 | DE_INIT(("init_hw done\n")); | 66 | DE_INIT(("init_hw done\n")); |
79 | return err; | 67 | return err; |
80 | } | 68 | } |
diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c index 227386602f9b..f7abe1b60a1d 100644 --- a/sound/pci/echoaudio/mia_dsp.c +++ b/sound/pci/echoaudio/mia_dsp.c | |||
@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
69 | if ((err = init_line_levels(chip))) | 69 | if ((err = init_line_levels(chip))) |
70 | return err; | 70 | return err; |
71 | 71 | ||
72 | /* Default routing of the virtual channels: vchannels 0-3 go to analog | ||
73 | outputs and vchannels 4-7 go to S/PDIF outputs */ | ||
74 | set_vmixer_gain(chip, 0, 0, 0); | ||
75 | set_vmixer_gain(chip, 1, 1, 0); | ||
76 | set_vmixer_gain(chip, 0, 2, 0); | ||
77 | set_vmixer_gain(chip, 1, 3, 0); | ||
78 | set_vmixer_gain(chip, 2, 4, 0); | ||
79 | set_vmixer_gain(chip, 3, 5, 0); | ||
80 | set_vmixer_gain(chip, 2, 6, 0); | ||
81 | set_vmixer_gain(chip, 3, 7, 0); | ||
82 | err = update_vmixer_level(chip); | ||
83 | |||
84 | DE_INIT(("init_hw done\n")); | 72 | DE_INIT(("init_hw done\n")); |
85 | return err; | 73 | return err; |
86 | } | 74 | } |