[PATCH v7 23/33] raop: Add address to RAOP device description

[crisp.fujita@xxxxxxxxx (Hajime Fujita)]

From: Hajime Fujita <crisp.fujita@xxxxxxxxx>

Some time one device announces multiple addresses (e.g. IPv4 one
and IPv6 one). Or some user may own multiple RAOP devices with
the same model name.
This patch adds device port to device description so that users
can distinguish appropriate RAOP sink by its address.
---
 src/modules/raop/module-raop-discover.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c
index bf05dec..c0b4549 100644
--- a/src/modules/raop/module-raop-discover.c
+++ b/src/modules/raop/module-raop-discover.c
@@ -241,19 +241,22 @@ static void resolver_cb(
     avahi_free(device);
     pa_xfree(dname);
 
+    avahi_address_snprint(at, sizeof(at), a);
     if (nicename) {
         args = pa_sprintf_malloc("server=[%s]:%u "
                                  "sink_name=%s "
-                                 "sink_properties='device.description=\"%s\"'",
-                                 avahi_address_snprint(at, sizeof(at), a), port,
+                                 "sink_properties='device.description=\"%s (%s:%u)\"'",
+                                 at, port,
                                  vname,
-                                 nicename);
+                                 nicename, at, port);
         pa_xfree(nicename);
     } else {
         args = pa_sprintf_malloc("server=[%s]:%u "
-                                 "sink_name=%s",
-                                 avahi_address_snprint(at, sizeof(at), a), port,
-                                 vname);
+                                 "sink_name=%s"
+                                 "sink_properties='device.description=\"%s:%u\"'",
+                                 at, port,
+                                 vname,
+                                 at, port);
     }
 
     if (tp != NULL) {
-- 
2.9.3