projects
/
profile
/
ivi
/
pulseaudio-panda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dfa00bf
)
alsa: use default output port names
author
Lennart Poettering
<lennart@poettering.net>
Mon, 15 Feb 2010 23:59:24 +0000
(
00:59
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 21 Feb 2010 16:47:23 +0000
(17:47 +0100)
instead of coming up with pointless aliases, reuse the already established
names, for second headphones, and second speakers.
src/modules/alsa/alsa-mixer.c
patch
|
blob
|
history
src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
patch
|
blob
|
history
src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
patch
|
blob
|
history
src/modules/alsa/mixer/paths/analog-output-headphones.conf
patch
|
blob
|
history
src/modules/alsa/mixer/paths/analog-output-speaker.conf
patch
|
blob
|
history
diff --git
a/src/modules/alsa/alsa-mixer.c
b/src/modules/alsa/alsa-mixer.c
index
cb814af
..
93f2ed0
100644
(file)
--- 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
9f18b25
..
dfdecf4
100644
(file)
--- 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
580c798
..
e47543f
100644
(file)
--- 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
79ebc7f
..
1d7bb0b
100644
(file)
--- 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
b133a2e
..
c6916d6
100644
(file)
--- 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