[pulseaudio-discuss] [PATCH 4/5] alsa-mixer: Remove the name option in the General section from path configuration files.

Tanu Kaskinen tanu.kaskinen at digia.com
Tue Apr 17 01:08:57 PDT 2012


The option is pointless, as far as I can see.
---
 src/modules/alsa/alsa-mixer.c                      |   51 --------------------
 src/modules/alsa/mixer/paths/analog-input-aux.conf |    1 -
 .../alsa/mixer/paths/analog-input-dock-mic.conf    |    1 -
 src/modules/alsa/mixer/paths/analog-input-fm.conf  |    1 -
 .../alsa/mixer/paths/analog-input-front-mic.conf   |    1 -
 .../mixer/paths/analog-input-internal-mic.conf     |    1 -
 .../alsa/mixer/paths/analog-input-mic-line.conf    |    1 -
 src/modules/alsa/mixer/paths/analog-input-mic.conf |    1 -
 .../alsa/mixer/paths/analog-input-rear-mic.conf    |    1 -
 .../alsa/mixer/paths/analog-input-tvtuner.conf     |    1 -
 .../mixer/paths/analog-output-desktop-speaker.conf |    1 -
 .../mixer/paths/analog-output-headphones-2.conf    |    1 -
 .../alsa/mixer/paths/analog-output-headphones.conf |    1 -
 .../alsa/mixer/paths/analog-output-speaker.conf    |    1 -
 14 files changed, 64 deletions(-)

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 574f44b..98a0da5 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2358,7 +2358,6 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
         /* [General] */
         { "priority",            pa_config_parse_unsigned,          NULL, "General" },
         { "description",         pa_config_parse_string,            NULL, "General" },
-        { "name",                pa_config_parse_string,            NULL, "General" },
 
         /* [Option ...] */
         { "priority",            option_parse_priority,             NULL, NULL },
@@ -3170,55 +3169,6 @@ static void path_set_condense(pa_alsa_path_set *ps, snd_mixer_t *m) {
     }
 }
 
-static pa_alsa_path* path_set_find_path_by_name(pa_alsa_path_set *ps, const char* name, pa_alsa_path *ignore)
-{
-    pa_alsa_path* p;
-    void *state;
-
-    PA_HASHMAP_FOREACH(p, ps->paths, state)
-        if (p != ignore && pa_streq(p->name, name))
-            return p;
-    return NULL;
-}
-
-static void path_set_make_paths_unique(pa_alsa_path_set *ps) {
-    pa_alsa_path *p, *q;
-    void *state, *state2;
-
-    PA_HASHMAP_FOREACH(p, ps->paths, state) {
-        unsigned i;
-        char *m;
-
-        q = path_set_find_path_by_name(ps, p->name, p);
-
-        if (!q)
-            continue;
-
-        m = pa_xstrdup(p->name);
-
-        /* OK, this name is not unique, hence let's rename */
-        i = 1;
-        PA_HASHMAP_FOREACH(q, ps->paths, state2) {
-            char *nn, *nd;
-
-            if (!pa_streq(q->name, m))
-                continue;
-
-            nn = pa_sprintf_malloc("%s-%u", m, i);
-            pa_xfree(q->name);
-            q->name = nn;
-
-            nd = pa_sprintf_malloc("%s %u", q->description, i);
-            pa_xfree(q->description);
-            q->description = nd;
-
-            i++;
-        }
-
-        pa_xfree(m);
-    }
-}
-
 static void mapping_free(pa_alsa_mapping *m) {
     pa_assert(m);
 
@@ -3743,7 +3693,6 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
     }
 
     path_set_condense(ps, mixer_handle);
-    path_set_make_paths_unique(ps);
 
     if (mixer_handle)
         snd_mixer_close(mixer_handle);
diff --git a/src/modules/alsa/mixer/paths/analog-input-aux.conf b/src/modules/alsa/mixer/paths/analog-input-aux.conf
index e6aa064..e93f104 100644
--- a/src/modules/alsa/mixer/paths/analog-input-aux.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-aux.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 80
-name = analog-input
 
 [Element Capture]
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
index 240b5f0..eaec928 100644
--- a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 78
-name = analog-input-microphone-dock
 
 [Jack Dock Mic]
 required-any = any
diff --git a/src/modules/alsa/mixer/paths/analog-input-fm.conf b/src/modules/alsa/mixer/paths/analog-input-fm.conf
index 7f150e3..3a26633 100644
--- a/src/modules/alsa/mixer/paths/analog-input-fm.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-fm.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 70
-name = analog-input-radio
 
 [Element Capture]
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
index 0b069f9..f17519b 100644
--- a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 85
-name = analog-input-microphone-front
 
 [Jack Front Mic]
 required-any = any
diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
index ba15f1c..718ca58 100644
--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
@@ -21,7 +21,6 @@
 
 [General]
 priority = 89
-name = analog-input-microphone-internal
 
 [Jack Mic]
 state.plugged = no
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
index fb80838..dece710 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 85
-name = analog-input
 
 [Element Capture]
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf
index 8aaf0cb..bc72a61 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 87
-name = analog-input-microphone
 
 [Jack Mic]
 required-any = any
diff --git a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
index 1e6fa57..91aff46 100644
--- a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 82
-name = analog-input-microphone-rear
 
 [Jack Rear Mic]
 required-any = any
diff --git a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
index fae3ce8..ab90f16 100644
--- a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 70
-name = analog-input-video
 
 [Element Capture]
 switch = mute
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 dfdecf4..9ca213a 100644
--- a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
@@ -20,7 +20,6 @@
 
 [General]
 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 284713b..54f4424 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -20,7 +20,6 @@
 
 [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 2860f28..28b109c 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 90
-name = analog-output-headphones
 
 [Jack Headphone]
 required-any = any
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 9c58ed9..8a046d6 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -20,7 +20,6 @@
 
 [General]
 priority = 100
-name = analog-output-speaker
 
 [Jack Headphone]
 state.plugged = no
-- 
1.7.10



More information about the pulseaudio-discuss mailing list