diff options
| author | pauldavisthefirst <paul@linuxaudiosystems.com> | 2014-03-05 20:54:00 -0500 |
|---|---|---|
| committer | pauldavisthefirst <paul@linuxaudiosystems.com> | 2014-03-05 20:54:00 -0500 |
| commit | 144f712ac2f42acf0c63d90320a663a7c399512e (patch) | |
| tree | ea73ea7762ae1eb4b35558c77e49390d6452f259 | |
| parent | cf5a0cef1794b4f7127b8a2c036fbd295914d137 (diff) | |
| parent | 87a8ffd7efc762fa64b67e58d4b2bcf93dbb9d18 (diff) | |
| download | jack1-144f712ac2f42acf0c63d90320a663a7c399512e.tar.gz | |
Merge pull request #9 from PeterN/fix
Fix for passing pointer to jack_intclient_t.
| m--------- | jack | 0 | ||||
| -rw-r--r-- | jackd/clientengine.c | 1 | ||||
| -rw-r--r-- | libjack/intclient.c | 4 | ||||
| m--------- | tools | 0 |
4 files changed, 3 insertions, 2 deletions
diff --git a/jack b/jack -Subproject 0b03e2b6a7657ec645399f98ac3b4a683a9dfdf +Subproject 60ee937d197b06e69424e5b848fbe744b42f4d1 diff --git a/jackd/clientengine.c b/jackd/clientengine.c index 15580f0..b8818da 100644 --- a/jackd/clientengine.c +++ b/jackd/clientengine.c @@ -582,6 +582,7 @@ jack_setup_client_control (jack_engine_t *engine, int fd, ClientType type, const client->handle = NULL; client->finish = NULL; client->error = 0; + client->private_client = NULL; if (type != ClientExternal) { diff --git a/libjack/intclient.c b/libjack/intclient.c index 9969482..e06722b 100644 --- a/libjack/intclient.c +++ b/libjack/intclient.c @@ -119,7 +119,7 @@ int jack_internal_client_handle (jack_client_t *client, const char *client_name, jack_status_t *status, - jack_intclient_t handle) + jack_intclient_t *handle) { jack_request_t req; jack_status_t my_status; @@ -137,7 +137,7 @@ jack_internal_client_handle (jack_client_t *client, *status = jack_client_deliver_request (client, &req); if (!jack_uuid_empty (req.x.intclient.uuid)) { - jack_uuid_copy (&handle, req.x.intclient.uuid); + jack_uuid_copy (handle, req.x.intclient.uuid); return 0; } diff --git a/tools b/tools -Subproject c0b7402b80c245c113f3747b261d3a39111ddaa +Subproject 76056b1332d26a3f457a7cd7fd4a4e1a74701d2 |