Skip to content

Commit

Permalink
ALSA: hda - Initialize output paths with current active states
Browse files Browse the repository at this point in the history
Set path->active flag at the path creation time and let the paths
initialized according to the current path->active state in
set_output_and_unmute().  This allows to modify the active flag of
some output paths dynamically, e.g. switching the front output route
with or without aamix like patch_via.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 985803c commit e1284af
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,10 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
}
if (!path)
dac = dacs[i] = 0;
else
else {
print_nid_path("output", path);
path->active = true;
}
if (dac)
badness += assign_out_path_ctls(codec, pin, dac);
}
Expand Down Expand Up @@ -1045,6 +1047,7 @@ static bool map_singles(struct hda_codec *codec, int outs,
dacs[i] = dac;
found = true;
print_nid_path("output", path);
path->active = true;
}
}
return found;
Expand Down Expand Up @@ -2418,6 +2421,7 @@ static void parse_digital(struct hda_codec *codec)
if (!path)
continue;
print_nid_path("digout", path);
path->active = true;
if (!nums) {
spec->multiout.dig_out_nid = dig_nid;
spec->dig_out_type = spec->autocfg.dig_out_type[0];
Expand Down Expand Up @@ -3556,10 +3560,8 @@ static void set_output_and_unmute(struct hda_codec *codec, hda_nid_t pin,
path = snd_hda_get_nid_path(codec, dac, pin);
if (!path)
return;
if (path->active)
return;
snd_hda_activate_path(codec, path, true, true);
set_pin_eapd(codec, pin, true);
snd_hda_activate_path(codec, path, path->active, true);
set_pin_eapd(codec, pin, path->active);
}

/* initialize primary output paths */
Expand Down

0 comments on commit e1284af

Please sign in to comment.