mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
a bunch of fixes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@10 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
edfad835cb
commit
c8cf0c1ce9
8 changed files with 28 additions and 21 deletions
|
|
@ -103,7 +103,10 @@ static void on_connection(struct socket_server*s, struct iochannel *io, void *us
|
|||
c->istream = NULL;
|
||||
c->ostream = NULL;
|
||||
c->protocol = p;
|
||||
|
||||
|
||||
c->client = client_new(p->core, "SIMPLE", "Client");
|
||||
assert(c->client);
|
||||
|
||||
if (p->mode & PROTOCOL_SIMPLE_RECORD) {
|
||||
struct source *source;
|
||||
|
||||
|
|
@ -128,8 +131,6 @@ static void on_connection(struct socket_server*s, struct iochannel *io, void *us
|
|||
assert(c->istream);
|
||||
}
|
||||
|
||||
c->client = client_new(p->core, "SIMPLE", "Client");
|
||||
assert(c->client);
|
||||
|
||||
iochannel_set_callback(c->io, io_callback, c);
|
||||
idxset_put(p->connections, c, NULL);
|
||||
|
|
@ -137,6 +138,8 @@ static void on_connection(struct socket_server*s, struct iochannel *io, void *us
|
|||
|
||||
fail:
|
||||
if (c) {
|
||||
if (c->client)
|
||||
client_free(c->client);
|
||||
if (c->istream)
|
||||
input_stream_free(c->istream);
|
||||
if (c->ostream)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue