Browse Source

wrap UUID generation

tags/0.124.0
Paul Davis 12 years ago
parent
commit
a1aeb6d7d2
4 changed files with 9 additions and 3 deletions
  1. +1
    -1
      jack
  2. +1
    -1
      jackd/clientengine.c
  3. +1
    -1
      jackd/engine.c
  4. +6
    -0
      libjack/uuid.c

+ 1
- 1
jack

@@ -1 +1 @@
Subproject commit 383c13c50ab517b79cf28bd3e594a9e6e21f5051
Subproject commit a6c5af6347fcf05c6df059b79e60aca205ecdcce

+ 1
- 1
jackd/clientengine.c View File

@@ -599,7 +599,7 @@ jack_setup_client_control (jack_engine_t *engine, int fd, ClientType type, const
client->control->timed_out = 0;

if (jack_uuid_empty (uuid)) {
uuid_generate (client->control->uuid);
jack_uuid_generate (client->control->uuid);
} else {
jack_uuid_copy (client->control->uuid, uuid);
}


+ 1
- 1
jackd/engine.c View File

@@ -4423,7 +4423,7 @@ fallback:
next:
shared->ptype_id = engine->control->port_types[i].ptype_id;
jack_uuid_copy (shared->client_id, req->x.port_info.client_id);
uuid_generate (shared->uuid);
jack_uuid_generate (shared->uuid);
shared->flags = req->x.port_info.flags;
shared->latency = 0;
shared->capture_latency.min = shared->capture_latency.max = 0;


+ 6
- 0
libjack/uuid.c View File

@@ -22,6 +22,12 @@

#include "internal.h"

void
jack_uuid_generate (jack_uuid_t uuid)
{
uuid_generate (uuid);
}

int
jack_uuid_empty (const jack_uuid_t u)
{


Loading…
Cancel
Save