lkml.org 
[lkml]   [2012]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] ALSA: hda - Rename capture sources of CX20549 to match common conventions
    Date
    This includes renaming "Line In" to line, also in the mixer settings.

    Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
    ---
    sound/pci/hda/patch_conexant.c | 26 +++++++++++++-------------
    1 files changed, 13 insertions(+), 13 deletions(-)

    diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
    index 60890ef..ab2cf5c 100644
    --- a/sound/pci/hda/patch_conexant.c
    +++ b/sound/pci/hda/patch_conexant.c
    @@ -686,27 +686,27 @@ static const struct hda_channel_mode cxt5045_modes[1] = {
    static const struct hda_input_mux cxt5045_capture_source = {
    .num_items = 2,
    .items = {
    - { "IntMic", 0x1 },
    - { "ExtMic", 0x2 },
    + { "Internal Mic", 0x1 },
    + { "Mic", 0x2 },
    }
    };

    static const struct hda_input_mux cxt5045_capture_source_benq = {
    .num_items = 5,
    .items = {
    - { "IntMic", 0x1 },
    - { "ExtMic", 0x2 },
    - { "LineIn", 0x3 },
    - { "CD", 0x4 },
    - { "Mixer", 0x0 },
    + { "CD", 0x4 },
    + { "Internal Mic", 0x1 },
    + { "Mic", 0x2 },
    + { "Line", 0x3 },
    + { "Mixer", 0x0 },
    }
    };

    static const struct hda_input_mux cxt5045_capture_source_hp530 = {
    .num_items = 2,
    .items = {
    - { "ExtMic", 0x1 },
    - { "IntMic", 0x2 },
    + { "Mic", 0x1 },
    + { "Internal Mic", 0x2 },
    }
    };

    @@ -826,10 +826,10 @@ static const struct snd_kcontrol_new cxt5045_benq_mixers[] = {
    HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
    HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),

    - HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),
    - HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),
    - HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),
    - HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),
    + HDA_CODEC_VOLUME("Line Capture Volume", 0x1a, 0x03, HDA_INPUT),
    + HDA_CODEC_MUTE("Line Capture Switch", 0x1a, 0x03, HDA_INPUT),
    + HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x3, HDA_INPUT),
    + HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x3, HDA_INPUT),

    HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),
    HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),
    --
    1.7.9.1


    \
     
     \ /
      Last update: 2012-04-06 15:37    [W:0.022 / U:0.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site