add custom jack client names (mod-audio#31)

Author: fps

src/effects.c

@@ -5028,7 +5028,7 @@ int effects_finish(int close_client)
     return SUCCESS;
 }
 
-int effects_add(const char *uri, int instance, int activate)
+int effects_add(const char *uri, int instance, const char *jack_client_name, int activate)
 {
     unsigned int ports_count;
     char effect_name[32], port_name[MAX_CHAR_BUF_SIZE+1];
@@ -5076,7 +5076,14 @@ int effects_add(const char *uri, int instance, int activate)
     lilv_instance = NULL;
 
     /* Create a client to Jack */
-    snprintf(effect_name, 31, "effect_%i", instance);
+    if (jack_client_name)
+    {
+        strncpy(effect_name, jack_client_name, 31);
+    }
+    else
+    {
+        snprintf(effect_name, 31, "effect_%i", instance);
+    }
     jack_client = jack_client_open(effect_name, JackNoStartServer, &jack_status);
 
     if (!jack_client)
@@ -5982,10 +5989,10 @@ int effects_add_multi(int activate, int num_effects, int *effects, const char *c
         return ERR_INVALID_OPERATION;
 
     if (num_effects == 1)
-        return effects_add(*uris, *effects, activate);
+        return effects_add(*uris, *effects, 0, activate);
 
     for (int i = 0; i < num_effects; ++i)
-        effects_add(uris[i], effects[i], activate);
+        effects_add(uris[i], effects[i], 0, activate);
 
     return SUCCESS;
 }

src/effects.h

@@ -142,7 +142,7 @@ typedef struct {
 
 int effects_init(void* client);
 int effects_finish(int close_client);
-int effects_add(const char *uri, int instance, int activate);
+int effects_add(const char *uri, int instance, const char *jack_client_name, int activate);
 int effects_add_multi(int activate, int num_effects, int *effects, const char *const *uris);
 int effects_remove(int effect_id);
 int effects_remove_multi(int num_effects, int *effects);

src/mod-host.c

@@ -138,7 +138,13 @@ static ZixThread intclient_socket_thread;
 static void effects_add_cb(proto_t *proto)
 {
     int resp;
-    resp = effects_add(proto->list[1], atoi(proto->list[2]), 1);
+    char *jack_client_name = NULL;
+    if (proto->list_count == 4)
+    {
+        jack_client_name = proto->list[3];
+    }
+    resp = effects_add(proto->list[1], atoi(proto->list[2]), jack_client_name, 1);
+ 
     protocol_response_int(resp, proto);
 }
 
@@ -159,7 +165,7 @@ static void effects_activate_cb(proto_t *proto)
 static void effects_preload_cb(proto_t *proto)
 {
     int resp;
-    resp = effects_add(proto->list[1], atoi(proto->list[2]), 0);
+    resp = effects_add(proto->list[1], atoi(proto->list[2]), 0, 0);
     protocol_response_int(resp, proto);
 }
 

src/mod-host.h

@@ -51,7 +51,7 @@
 #define SOCKET_MSG_BUFFER_SIZE  1024
 
 /* Protocol commands definition */
-#define EFFECT_ADD              "add %s %i"
+#define EFFECT_ADD              "add %s %i ..."
 #define EFFECT_REMOVE           "remove %i"
 #define EFFECT_ACTIVATE         "activate %i %i"
 #define EFFECT_PRELOAD          "preload %s %i"

tests/effectlib_test.c

@@ -14,7 +14,7 @@ int main (void)
     if (effects_init(NULL) == 0)
     {
         action = "add: http://lv2plug.in/plugins/eg-amp";
-        ret = effects_add("http://lv2plug.in/plugins/eg-amp", 0);
+        ret = effects_add("http://lv2plug.in/plugins/eg-amp", 0, NULL);
         printf("%s, ret: %i\n", action, ret);
 
         if (ret != 0)