* [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions
@ 2012-04-05 13:30 Michael Karcher
2012-04-05 14:29 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Michael Karcher @ 2012-04-05 13:30 UTC (permalink / raw)
To: Jaroslav Kysela, alsa-devel, linux-kernel, Takashi Iwai
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 8c6523b..7d92aac 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -687,18 +687,18 @@ 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 },
+ { "Internal Mic", 0x1 },
+ { "Mic", 0x2 },
+ { "Line In", 0x3 },
{ "Mixer", 0x0 },
}
};
@@ -706,8 +706,8 @@ static const struct hda_input_mux cxt5045_capture_source_benq = {
static const struct hda_input_mux cxt5045_capture_source_hp530 = {
.num_items = 2,
.items = {
- { "ExtMic", 0x1 },
- { "IntMic", 0x2 },
+ { "Mic", 0x1 },
+ { "Internal Mic", 0x2 },
}
};
--
1.7.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions
2012-04-05 13:30 [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions Michael Karcher
@ 2012-04-05 14:29 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2012-04-05 14:29 UTC (permalink / raw)
To: Michael Karcher; +Cc: alsa-devel, linux-kernel
At Thu, 05 Apr 2012 15:30:06 +0200,
Michael Karcher wrote:
>
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index 8c6523b..7d92aac 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -687,18 +687,18 @@ 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 },
> + { "Internal Mic", 0x1 },
> + { "Mic", 0x2 },
> + { "Line In", 0x3 },
This could be simply "Line".
Other than that, looks good.
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-05 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-05 13:30 [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions Michael Karcher
2012-04-05 14:29 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).