lkml.org 
[lkml]   [2011]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] ASoC: DAPM: Allow multiple mixer sources to be routed via the same switch
    Date
    Currently it is only possible to route one source per switch into a mixer.
    This patch modifies the code, so that it is possible to route multiple sources
    into a mixer via the same switch. One use-case for this is routing a stereo
    channel pair into a mono-mixer via the same switch.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    ---
    sound/soc/soc-dapm.c | 6 +++++-
    1 files changed, 5 insertions(+), 1 deletions(-)

    diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
    index c265311..170c4ff 100644
    --- a/sound/soc/soc-dapm.c
    +++ b/sound/soc/soc-dapm.c
    @@ -443,6 +443,11 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
    if (path->name != (char *)w->kcontrol_news[i].name)
    continue;

    + if (w->kcontrols[i]) {
    + path->kcontrol = w->kcontrols[i];
    + continue;
    + }
    +
    wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
    sizeof(struct snd_soc_dapm_widget *),
    wlist = kzalloc(wlistsize, GFP_KERNEL);
    @@ -1556,7 +1561,6 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
    /* found, now check type */
    found = 1;
    path->connect = connect;
    - break;
    }

    if (found)
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2011-08-15 20:21    [W:0.023 / U:0.364 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site