mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Improve "well known descriptions" for ports

Browse source 
* If we don't have "Digital Speakers", we should say "Speakers"
   instead of "Analog Speakers", and similar for other ports.
 * Change "IEC958" to "S/PDIF" (more well known name)
 * Add new ports and mappings for HDMI
 * Change "Internal" to "Built-in" for the card name

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2012-01-11 15:40:08 +01:00 • committed by Colin Guthrie
parent 6c5eba6914
commit 13e1c4bdee
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/alsa/alsa-mixer.c
View file

@ -2219,8 +2219,8 @@ static int option_verify(pa_alsa_option *o) {
{ "input", N_("Input") }, { "input", N_("Input") },
{ "input-docking", N_("Docking Station Input") }, { "input-docking", N_("Docking Station Input") },
{ "input-docking-microphone", N_("Docking Station Microphone") }, { "input-docking-microphone", N_("Docking Station Microphone") },
{ "input-docking-linein", N_("Docking Station Line-In") }, { "input-docking-linein", N_("Docking Station Line In") },
{ "input-linein", N_("Line-In") }, { "input-linein", N_("Line In") },
{ "input-microphone", N_("Microphone") }, { "input-microphone", N_("Microphone") },
{ "input-microphone-front", N_("Front Microphone") }, { "input-microphone-front", N_("Front Microphone") },
{ "input-microphone-rear", N_("Rear Microphone") }, { "input-microphone-rear", N_("Rear Microphone") },
@ -2299,21 +2299,23 @@ static int element_verify(pa_alsa_element *e) {
static int path_verify(pa_alsa_path *p) { static int path_verify(pa_alsa_path *p) {
static const struct description_map well_known_descriptions[] = { static const struct description_map well_known_descriptions[] = {
{ "analog-input", N_("Analog Input") }, { "analog-input", N_("Analog Input") },
{ "analog-input-microphone", N_("Analog Microphone") }, { "analog-input-microphone", N_("Microphone") },
{ "analog-input-microphone-front", N_("Front Microphone") }, { "analog-input-microphone-front", N_("Front Microphone") },
{ "analog-input-microphone-rear", N_("Rear Microphone") }, { "analog-input-microphone-rear", N_("Rear Microphone") },
{ "analog-input-microphone-dock", N_("Docking Station Microphone") }, { "analog-input-microphone-dock", N_("Dock Microphone") },
{ "analog-input-microphone-internal", N_("Internal Microphone") }, { "analog-input-microphone-internal", N_("Internal Microphone") },
{ "analog-input-linein", N_("Analog Line-In") }, { "analog-input-linein", N_("Line In") },
{ "analog-input-radio", N_("Analog Radio") }, { "analog-input-radio", N_("Radio") },
{ "analog-input-video", N_("Analog Video") }, { "analog-input-video", N_("Video") },
{ "analog-output", N_("Analog Output") }, { "analog-output", N_("Analog Output") },
{ "analog-output-headphones", N_("Analog Headphones") }, { "analog-output-headphones", N_("Headphones") },
{ "analog-output-lfe-on-mono", N_("Analog Output (LFE)") }, { "analog-output-lfe-on-mono", N_("LFE on Separate Mono Output") },
{ "analog-output-lineout", N_("Line Out") },
{ "analog-output-mono", N_("Analog Mono Output") }, { "analog-output-mono", N_("Analog Mono Output") },
{ "analog-output-speaker", N_("Analog Speakers") }, { "analog-output-speaker", N_("Speakers") },
{ "iec958-stereo-output", N_("Digital Output (IEC958)") }, { "hdmi-output", N_("HDMI / DisplayPort") },
{ "iec958-passthrough-output", N_("Digital Passthrough (IEC958)") } { "iec958-stereo-output", N_("Digital Output (S/PDIF)") },
{ "iec958-passthrough-output", N_("Digital Passthrough (S/PDIF)") }
}; };
pa_alsa_element *e; pa_alsa_element *e;
@ -3768,7 +3770,8 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
{ "iec958-passthrough", N_("Digital Passthrough (IEC958)") }, { "iec958-passthrough", N_("Digital Passthrough (IEC958)") },
{ "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") }, { "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") },
{ "iec958-ac3-surround-51", N_("Digital Surround 5.1 (IEC958/AC3)") }, { "iec958-ac3-surround-51", N_("Digital Surround 5.1 (IEC958/AC3)") },
{ "hdmi-stereo", N_("Digital Stereo (HDMI)") } { "hdmi-stereo", N_("Digital Stereo (HDMI)") },
{ "hdmi-surround-51", N_("Digital Surround 5.1 (HDMI)") }
}; };
pa_assert(m); pa_assert(m);

2
src/pulsecore/sink.c
View file

@ -3346,7 +3346,7 @@ pa_bool_t pa_device_init_description(pa_proplist *p) {
if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR))) if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR)))
if (pa_streq(s, "internal")) if (pa_streq(s, "internal"))
d = _("Internal Audio"); d = _("Built-in Audio");
if (!d) if (!d)
if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_CLASS))) if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_CLASS)))