[pulseaudio-commits] r1257 - /trunk/src/modules/module-zeroconf-publish.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Aug 15 20:15:00 2006
New Revision: 1257

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1257&root=pulseaudio&view=rev
Log:
use the description field of sinks/sources to name the zeroconf services, instead of the logical name

Modified:
    trunk/src/modules/module-zeroconf-publish.c

Modified: trunk/src/modules/module-zeroconf-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-zeroconf-publish.c?rev=1257&root=pulseaudio&r1=1256&r2=1257&view=diff
==============================================================================
--- trunk/src/modules/module-zeroconf-publish.c (original)
+++ trunk/src/modules/module-zeroconf-publish.c Tue Aug 15 20:15:00 2006
@@ -240,7 +240,7 @@
     return r;
 }
 
-static struct service *get_service(struct userdata *u, const char *name) {
+static struct service *get_service(struct userdata *u, const char *name, const char *description) {
     struct service *s;
     char hn[64];
     
@@ -253,7 +253,7 @@
     s->published = UNPUBLISHED;
     s->name = pa_xstrdup(name);
     s->loaded.valid = s->autoload.valid = 0;
-    s->service_name = pa_sprintf_malloc("%s on %s", s->name, pa_get_host_name(hn, sizeof(hn)));
+    s->service_name = pa_sprintf_malloc("%s on %s", description ? description : s->name, pa_get_host_name(hn, sizeof(hn)));
 
     pa_hashmap_put(u->services, s->name, s);
 
@@ -265,7 +265,7 @@
     int ret;
     assert(u && s);
 
-    svc = get_service(u, s->name);
+    svc = get_service(u, s->name, s->description);
     if (svc->loaded.valid)
         return publish_service(u, svc);
 
@@ -286,7 +286,7 @@
     
     assert(u && s);
 
-    svc = get_service(u, s->name);
+    svc = get_service(u, s->name, s->description);
     if (svc->loaded.valid)
         return publish_service(u, svc);
 
@@ -309,7 +309,7 @@
     
     assert(u && s);
 
-    svc = get_service(u, s->name);
+    svc = get_service(u, s->name, NULL);
     if (svc->autoload.valid)
         return publish_service(u, svc);