Ticket #252: pa_custom_hal_names.patch

src/modules/module-alsa-sink.c

@@ -56 +56 @@
 PA_MODULE_LOAD_ONCE(FALSE);
 PA_MODULE_USAGE(
         "sink_name=<name for the sink> "
+        "description=<description for the sink>"
         "device=<ALSA device> "
         "device_id=<ALSA device id> "
         "format=<sample format> "
@@ -102 +103 @@
 static const char* const valid_modargs[] = {
     "device",
     "device_id",
+    "description",
     "sink_name",
     "format",
     "channels",
@@ -873 +875 @@
     pa_sink_set_module(u->sink, m);
     pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
     pa_sink_set_rtpoll(u->sink, u->rtpoll);
-    pa_sink_set_description(u->sink, t = pa_sprintf_malloc(
+
+    if(pa_modargs_get_value(ma, "description", NULL) != NULL)
+       pa_sink_set_description(u->sink, t = pa_sprintf_malloc("%s", (char*) pa_modargs_get_value(ma, "description", NULL)));
+    else
+       pa_sink_set_description(u->sink, t = pa_sprintf_malloc(
                                     "ALSA PCM on %s (%s)%s",
                                     u->device_name,
                                     snd_pcm_info_get_name(pcm_info),

src/modules/module-alsa-source.c

@@ -58 +58 @@
 PA_MODULE_USAGE(
         "source_name=<name for the source> "
         "device=<ALSA device> "
+        "description=<description for the source>"
         "device_id=<ALSA device id> "
         "format=<sample format> "
         "channels=<number of channels> "
@@ -101 +102 @@
     "device",
     "device_id",
     "source_name",
+    "description",
     "channels",
     "rate",
     "format",
@@ -852 +854 @@
     pa_source_set_module(u->source, m);
     pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
     pa_source_set_rtpoll(u->source, u->rtpoll);
-    pa_source_set_description(u->source, t = pa_sprintf_malloc(
+
+    if(pa_modargs_get_value(ma, "description", NULL) != NULL)
+       pa_source_set_description(u->source, t = pa_sprintf_malloc("%s", (char*) pa_modargs_get_value(ma, "description", NULL)));
+    else
+       pa_source_set_description(u->source, t = pa_sprintf_malloc(
                                       "ALSA PCM on %s (%s)%s",
                                       u->device_name,
                                       snd_pcm_info_get_name(pcm_info),

src/modules/module-hal-detect.c

@@ -163 +163 @@
     const char *module_name;
     DBusError error;
     pa_module *m;
+     char *p_udi, *parent_udi;
+     char *custom_source_name = NULL, *custom_sink_name = NULL, *custom_sink_description = NULL, *custom_source_description = NULL;
+    unsigned int i;
+
 
     dbus_error_init(&error);
 
@@ -187 +191 @@
     if (hal_alsa_device_is_modem(u->context, udi, &error))
         goto fail;
 
+    p_udi = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, udi, "info.parent", &error));
+    parent_udi = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, p_udi, "info.parent", &error));
+
+    if(libhal_device_property_exists(u->context, parent_udi, "pulse.sink_name", &error))
+        custom_sink_name = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, parent_udi, "pulse.sink_name", &error));
+     else if(libhal_device_property_exists(u->context, parent_udi, "pulse.device_name", &error))
+        custom_sink_name = pa_sprintf_malloc("%s_output", libhal_device_get_property_string(u->context, parent_udi, "pulse.device_name", &error));
+
+   if(libhal_device_property_exists(u->context, parent_udi, "pulse.source_name", &error))
+        custom_source_name = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, parent_udi, "pulse.source_name", &error));
+    else if(libhal_device_property_exists(u->context, parent_udi, "pulse.device_name", &error))
+        custom_source_name = pa_sprintf_malloc("%s_input", libhal_device_get_property_string(u->context, parent_udi, "pulse.device_name", &error));
+
+   if(libhal_device_property_exists(u->context, parent_udi, "pulse.sink_description", &error))
+        custom_sink_description = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, parent_udi, "pulse.sink_description", &error));
+
+   if(libhal_device_property_exists(u->context, parent_udi, "pulse.source_description", &error))
+        custom_source_description = pa_sprintf_malloc("%s", libhal_device_get_property_string(u->context, parent_udi, "pulse.source_description", &error));
+
+    if(custom_sink_name != NULL){
+        for(i = 0; i < strlen(custom_sink_name); i++)
+            if(custom_sink_name[i] == ' ')
+                custom_sink_name[i] = '_';
+    }
+
+    if(custom_source_name != NULL){
+        for(i = 0; i < strlen(custom_source_name); i++)
+            if(custom_source_name[i] == ' ')
+                custom_source_name[i] = '_';
+    }
+
     if (type == ALSA_TYPE_SINK) {
-        *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi));
+          if(custom_sink_name != NULL)        
+            *sink_name = pa_sprintf_malloc("%s", custom_sink_name);
+          else
+            *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi));
 
         module_name = "module-alsa-sink";
         args = pa_sprintf_malloc("device_id=%u sink_name=%s", card, *sink_name);
+        if(custom_sink_description != NULL)
+            args = pa_sprintf_malloc("%s description=\"%s\"", args, custom_sink_description);
     } else {
-        *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi));
+          if(custom_source_name != NULL)        
+            *source_name = pa_sprintf_malloc("%s", custom_source_name);
+          else
+            *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi));
 
         module_name = "module-alsa-source";
         args = pa_sprintf_malloc("device_id=%u source_name=%s", card, *source_name);
+        if(custom_source_description != NULL)
+            args = pa_sprintf_malloc("%s description=\"%s\"", args, custom_source_description);
     }
 
+
     pa_log_debug("Loading %s with arguments '%s'", module_name, args);
 
     m = pa_module_load(u->core, module_name, args);
@@ -206 +252 @@
     pa_xfree(args);
 
     if (!m) {
+        pa_xfree(p_udi);
+        pa_xfree(parent_udi);
         pa_xfree(*sink_name);
         pa_xfree(*source_name);
         *sink_name = *source_name = NULL;