mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

raop: Show device codename in sink properties

Browse source 
This will make it easier for testers to report latency offset for their
specific hardware.
This commit is contained in:
Colin Leroy 2017-10-09 09:26:42 +02:00 • committed by Tanu Kaskinen
parent cbc4424821
commit 77c1226181
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/modules/raop/module-raop-discover.c
View file

@ -168,6 +168,7 @@ static void resolver_cb(
char *device = NULL, *nicename, *dname, *vname, *args; char *device = NULL, *nicename, *dname, *vname, *args;
char *tp = NULL, *et = NULL, *cn = NULL; char *tp = NULL, *et = NULL, *cn = NULL;
char *ch = NULL, *ss = NULL, *sr = NULL; char *ch = NULL, *ss = NULL, *sr = NULL;
char *dm = NULL;
char *t = NULL; char *t = NULL;
char at[AVAHI_ADDRESS_STR_MAX]; char at[AVAHI_ADDRESS_STR_MAX];
AvahiStringList *l; AvahiStringList *l;
@ -256,7 +257,8 @@ static void resolver_cb(
sr = pa_xstrdup(value); sr = pa_xstrdup(value);
} else if (pa_streq(key, "am")) { } else if (pa_streq(key, "am")) {
/* Device model */ /* Device model */
latency = guess_latency_from_device(value); pa_xfree(dm);
dm = pa_xstrdup(value);
} }
avahi_free(key); avahi_free(key);
@ -278,6 +280,7 @@ static void resolver_cb(
pa_xfree(ch); pa_xfree(ch);
pa_xfree(ss); pa_xfree(ss);
pa_xfree(sr); pa_xfree(sr);
pa_xfree(dm);
goto finish; goto finish;
} }
@ -285,22 +288,24 @@ static void resolver_cb(
pa_xfree(dname); pa_xfree(dname);
avahi_address_snprint(at, sizeof(at), a); avahi_address_snprint(at, sizeof(at), a);
if (nicename) {
args = pa_sprintf_malloc("server=[%s]:%u " if (nicename == NULL)
"sink_name=%s " nicename = pa_xstrdup("RAOP");
"sink_properties='device.description=\"%s (%s:%u)\"'",
at, port, if (dm == NULL)
vname, dm = pa_xstrdup(_("Unknown device model"));
nicename, at, port);
pa_xfree(nicename); latency = guess_latency_from_device(dm);
} else {
args = pa_sprintf_malloc("server=[%s]:%u " args = pa_sprintf_malloc("server=[%s]:%u "
"sink_name=%s" "sink_name=%s "
"sink_properties='device.description=\"%s:%u\"'", "sink_properties='device.description=\"%s (%s:%u)\" device.model=\"%s\"'",
at, port, at, port,
vname, vname,
at, port); nicename, at, port,
} dm);
pa_xfree(nicename);
pa_xfree(dm);
if (tp != NULL) { if (tp != NULL) {
t = args; t = args;