diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-05-14 00:41:58 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-05-14 00:41:58 +0000 |
| commit | c5faeb1390e849a61a223ca3c6e2a87c87f3a349 (patch) | |
| tree | 39f6eafe6b7b591e9d5cad9c242ce07a46ffa7f2 | |
| parent | aae8beb8cc83244900fe3ab19a12b972833f30ca (diff) | |
| download | pulseaudio-c5faeb1390e849a61a223ca3c6e2a87c87f3a349.tar.gz | |
store peer name in native-protocol.peer property
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2413 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulsecore/protocol-native.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index a824b4da0..ee7e1ed82 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -1038,10 +1038,8 @@ static void request_bytes(playback_stream *s) { previous_missing = pa_atomic_add(&s->missing, m); if (pa_memblockq_prebuf_active(s->memblockq) || - (previous_missing < s->minreq && previous_missing+m >= s->minreq)) { - pa_assert(pa_thread_mq_get()); + (previous_missing < s->minreq && previous_missing+m >= s->minreq)) pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL); - } } static void send_memblock(connection *c) { @@ -3921,6 +3919,7 @@ static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, vo pa_iochannel_socket_peer_to_string(io, pname, sizeof(pname)); pa_snprintf(cname, sizeof(cname), "Native client (%s)", pname); c->client = pa_client_new(p->core, __FILE__, cname); + pa_proplist_sets(c->client, "native-protocol.peer", pname); c->client->kill = client_kill_cb; c->client->userdata = c; c->client->module = p->module; |