alsa: use default output port names

instead of coming up with pointless aliases, reuse the already established
names, for second headphones, and second speakers.

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index cb814aff0e3019c9fbbd70fc323657b8349e3dbb..93f2ed0556588afa4f14fcb9b2f8790fbd23764c 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 9f18b25aafb433b3eeba817a3619dbf808c33237..dfdecf417d020cb79312d5323c2f2dfcdf970bbf 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 580c798626fd200f2f46e8c2424eff3cac3e32c2..e47543f54da23b03ee2d5601f94326ef5fc91c33 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 79ebc7fd219396ac8ca2909d21277aef8fbd7ba8..1d7bb0ba7f4c4cc14ef029fb4806bef6d54d9200 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 b133a2ee104ad54c9c3d8f2ce6185b5e159afa1d..c6916d6b9666924196c4aac83984db61d85bbdf7 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