diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-06-24 23:57:37 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-10-08 20:36:24 +0100 |
| commit | 36f2aad5f0892e6738a8d59111c3c9017152db7e (patch) | |
| tree | 07925b143d50fd33faf7a8e3e6d61154e0adb323 | |
| parent | 0ff75aea053cb8a7af958aa72d99b27cc90becf6 (diff) | |
Use the new pa_namereg_make_valid_name() function.
| -rw-r--r-- | src/modules/module-raop-discover.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c index 7f89bb5c..baa64eec 100644 --- a/src/modules/module-raop-discover.c +++ b/src/modules/module-raop-discover.c @@ -154,7 +154,7 @@ static void resolver_cb( if (event != AVAHI_RESOLVER_FOUND) pa_log("Resolving of '%s' failed: %s", name, avahi_strerror(avahi_client_errno(u->client))); else { - char *device = NULL, *dname, *args; + char *device = NULL, *dname, *vname, *args; char at[AVAHI_ADDRESS_STR_MAX]; AvahiStringList *l; pa_module *m; @@ -178,23 +178,24 @@ static void resolver_cb( else dname = pa_sprintf_malloc("airtunes.%s", host_name); - if (!pa_namereg_is_valid_name(dname)) { - pa_log("Cannot construct valid device name from credentials of service '%s'.", dname); + if (!(vname = pa_namereg_make_valid_name(dname))) { + pa_log("Cannot construct valid device name from '%s'.", dname); avahi_free(device); pa_xfree(dname); goto finish; } + pa_xfree(dname); /* TODO: allow this syntax of server name in things.... args = pa_sprintf_malloc("server=[%s]:%u " "sink_name=%s", avahi_address_snprint(at, sizeof(at), a), port, - dname);*/ + vname);*/ args = pa_sprintf_malloc("server=%s " "sink_name=%s", avahi_address_snprint(at, sizeof(at), a), - dname); + vname); pa_log_debug("Loading module-raop-sink with arguments '%s'", args); @@ -204,7 +205,7 @@ static void resolver_cb( tnl = NULL; } - pa_xfree(dname); + pa_xfree(vname); pa_xfree(args); avahi_free(device); } |