diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-11 17:47:38 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-11 17:47:38 -0500 |
| commit | 7ae3b2be3c4f77f023f79f67430cf45fb97cab8d (patch) | |
| tree | 8aeea09f1298e6da892f9b63753c9fc1e307007a | |
| parent | 5f6361e530b560b43614282f5141fd17ee3ebc9e (diff) | |
| download | jack1-7ae3b2be3c4f77f023f79f67430cf45fb97cab8d.tar.gz | |
Revert "Set driver port order metadata".
The "client" argument being passed to jack_set_property() is
jack_client_internal_t*, not jack_client_t* as expected, which leads
to a crash. Using client->private_client (which is a jack_client_t*)
causes deadlock because do_request() is called recursively.
The goal here is good, but it can't be accomplished in this way.
This reverts commit 439e47da1a179f62ce9e6601851b4f90381da0de.
| -rw-r--r-- | jackd/engine.c | 11 | ||||
| -rw-r--r-- | libjack/client.c | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/jackd/engine.c b/jackd/engine.c index b92051c..cfac483 100644 --- a/jackd/engine.c +++ b/jackd/engine.c @@ -4474,17 +4474,6 @@ next: req->x.port_info.port_id = port_id; - if (internal) { - /* set port order so clients can list ports in the proper order if - * there are more than 9 driver ports (since the lack of leading zeros - * breaks sorting by name) */ - char index_str[16]; - snprintf (index_str, sizeof(index_str), "%d", port_id); - jack_set_property (client, shared->uuid, - "http://jackaudio.org/metadata/order", index_str, - "http://www.w3.org/2001/XMLSchema#integer"); - } - return 0; } diff --git a/libjack/client.c b/libjack/client.c index 39799de..32e97d8 100644 --- a/libjack/client.c +++ b/libjack/client.c @@ -295,15 +295,10 @@ jack_client_deliver_request (const jack_client_t *client, jack_request_t *req) { /* indirect through the function pointer that was set either * by jack_client_open() or by jack_new_client_request() in - * the server. possibly NULL during driver port registration, - * in which case we don't care about request delivery. + * the server. */ - if (client->deliver_request) { - return client->deliver_request (client->deliver_arg, req); - } - - return 0; + return client->deliver_request (client->deliver_arg, req); } #if JACK_USE_MACH_THREADS |