diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-02-16 00:59:24 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-02-21 17:47:23 +0100 |
| commit | abfd2aa0e712223a3573aa43468dacf3eee3c4e4 (patch) | |
| tree | 67672436e16abcb712d1418e98a544f8061bcca2 /src | |
| parent | dfa00bf8f846d0e1ea0f47b09d114768a781abb7 (diff) | |
alsa: use default output port names
instead of coming up with pointless aliases, reuse the already established
names, for second headphones, and second speakers.
Diffstat (limited to 'src')
5 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index cb814aff..93f2ed05 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -1783,9 +1783,7 @@ static int path_verify(pa_alsa_path *p) { { "analog-output-headphones", N_("Analog Headphones") }, { "analog-output-lfe-on-mono", N_("Analog Output (LFE)") }, { "analog-output-mono", N_("Analog Mono Output") }, - { "analog-output-headphones-2", N_("Analog Headphones 2") }, { "analog-output-speaker", N_("Analog Speakers") } - { "analog-output-desktop-speaker", N_("Analog Speakers 2") } }; pa_alsa_element *e; diff --git a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf index 9f18b25a..dfdecf41 100644 --- a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf @@ -19,7 +19,8 @@ ; See analog-output.conf.common for an explanation on the directives [General] -priority = 100 +priority = 101 +name = analog-output-speaker [Element Hardware Master] switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf index 580c7986..e47543f5 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf @@ -20,6 +20,7 @@ [General] priority = 89 +name = analog-output-headphones [Element Hardware Master] switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf index 79ebc7fd..1d7bb0ba 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf @@ -20,6 +20,7 @@ [General] priority = 90 +name = analog-output-headphones [Element Hardware Master] switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf index b133a2ee..c6916d6b 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf @@ -20,6 +20,7 @@ [General] priority = 100 +name = analog-output-speaker [Element Hardware Master] switch = mute |