mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -596,12 +596,12 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
|
|||
}
|
||||
|
||||
#ifdef TUNNEL_SINK
|
||||
snprintf(name, sizeof(name), "Tunnel from host %s, user %s, sink %s",
|
||||
pa_snprintf(name, sizeof(name), "Tunnel from host %s, user %s, sink %s",
|
||||
pa_get_host_name(hn, sizeof(hn)),
|
||||
pa_get_user_name(un, sizeof(un)),
|
||||
u->sink->name);
|
||||
#else
|
||||
snprintf(name, sizeof(name), "Tunnel from host %s, user %s, source %s",
|
||||
pa_snprintf(name, sizeof(name), "Tunnel from host %s, user %s, source %s",
|
||||
pa_get_host_name(hn, sizeof(hn)),
|
||||
pa_get_user_name(un, sizeof(un)),
|
||||
u->source->name);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue