Commit 4c55bb01 authored by Giuliano Pochini's avatar Giuliano Pochini Committed by Takashi Iwai

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: default avatarGiuliano Pochini <pochini@shiny.it>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9f5d790d
...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) ...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
if ((err = init_line_levels(chip)) < 0) if ((err = init_line_levels(chip)) < 0)
return err; return err;
/* Default routing of the virtual channels: all vchannels are routed
to the stereo output */
set_vmixer_gain(chip, 0, 0, 0);
set_vmixer_gain(chip, 1, 1, 0);
set_vmixer_gain(chip, 0, 2, 0);
set_vmixer_gain(chip, 1, 3, 0);
set_vmixer_gain(chip, 0, 4, 0);
set_vmixer_gain(chip, 1, 5, 0);
set_vmixer_gain(chip, 0, 6, 0);
set_vmixer_gain(chip, 1, 7, 0);
err = update_vmixer_level(chip);
DE_INIT(("init_hw done\n")); DE_INIT(("init_hw done\n"));
return err; return err;
} }
......
...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) ...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
if ((err = init_line_levels(chip)) < 0) if ((err = init_line_levels(chip)) < 0)
return err; return err;
/* Default routing of the virtual channels: vchannels 0-3 and
vchannels 4-7 are routed to real channels 0-4 */
set_vmixer_gain(chip, 0, 0, 0);
set_vmixer_gain(chip, 1, 1, 0);
set_vmixer_gain(chip, 2, 2, 0);
set_vmixer_gain(chip, 3, 3, 0);
set_vmixer_gain(chip, 0, 4, 0);
set_vmixer_gain(chip, 1, 5, 0);
set_vmixer_gain(chip, 2, 6, 0);
set_vmixer_gain(chip, 3, 7, 0);
err = update_vmixer_level(chip);
DE_INIT(("init_hw done\n")); DE_INIT(("init_hw done\n"));
return err; return err;
} }
......
...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) ...@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
if ((err = init_line_levels(chip)) < 0) if ((err = init_line_levels(chip)) < 0)
return err; return err;
/* Default routing of the virtual channels: all vchannels are routed
to the stereo output */
set_vmixer_gain(chip, 0, 0, 0);
set_vmixer_gain(chip, 1, 1, 0);
set_vmixer_gain(chip, 0, 2, 0);
set_vmixer_gain(chip, 1, 3, 0);
set_vmixer_gain(chip, 0, 4, 0);
set_vmixer_gain(chip, 1, 5, 0);
set_vmixer_gain(chip, 0, 6, 0);
set_vmixer_gain(chip, 1, 7, 0);
err = update_vmixer_level(chip);
DE_INIT(("init_hw done\n")); DE_INIT(("init_hw done\n"));
return err; return err;
} }
......
...@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) ...@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
if ((err = init_line_levels(chip))) if ((err = init_line_levels(chip)))
return err; return err;
/* Default routing of the virtual channels: vchannels 0-3 go to analog
outputs and vchannels 4-7 go to S/PDIF outputs */
set_vmixer_gain(chip, 0, 0, 0);
set_vmixer_gain(chip, 1, 1, 0);
set_vmixer_gain(chip, 0, 2, 0);
set_vmixer_gain(chip, 1, 3, 0);
set_vmixer_gain(chip, 2, 4, 0);
set_vmixer_gain(chip, 3, 5, 0);
set_vmixer_gain(chip, 2, 6, 0);
set_vmixer_gain(chip, 3, 7, 0);
err = update_vmixer_level(chip);
DE_INIT(("init_hw done\n")); DE_INIT(("init_hw done\n"));
return err; return err;
} }
......
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