Changeset 3986

Timestamp:

2012-02-17 22:54:24 (15 months ago)

Author:

drobilla

Message:

Add -d option and implement proper communication dumping.

Location:

trunk/jalv

Files:

• doc/jalv.1 (modified) (2 diffs)
• src/atom_rdf.c (added)
• src/jalv.c (modified) (6 diffs)
• src/jalv_console.c (modified) (3 diffs)
• src/jalv_gtk2.c (modified) (2 diffs)
• src/jalv_internal.h (modified) (3 diffs)
• src/symap.c (modified) (2 diffs)
• wscript (modified) (1 diff)

trunk/jalv/doc/jalv.1

@@ -1 @@
-.TH JALV "17 Jan 2012"
+.TH JALV "18 Feb 2012"
 
 .SH NAME
@@ -21 +21 @@
 Load state from state directory.
 
+.TP
+\fB\-d DIR\fR
+Dump plugin <=> UI communication.
+
 .SH SEE ALSO
 .BR lv2ls(1),

trunk/jalv/src/jalv.c

@@ -1 +1 @@
 /*
-  Copyright 2007-2011 David Robillard <http://drobilla.net>
+  Copyright 2007-2012 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
@@ -53 +53 @@
 #define NS_MIDI "http://lv2plug.in/ns/ext/midi#"
 #define NS_PSET "http://lv2plug.in/ns/ext/presets#"
-
+#define NS_RDF  "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+
+#define USTR(str) ((const uint8_t*)str)
+    
 ZixSem exit_sem;  /**< Exit semaphore */
 
@@ -387 +390 @@
                 port->control = *(float*)body;
             } else if (ev.protocol == host->atom_prot_id) {
-                printf("ATOM UI READ\n");
-                for (uint32_t i = 0; i < ev.size; ++i) {
-                    printf("%c", body[i]);
-                }
-                printf("\n");
                 LV2_Evbuf_Iterator    i    = lv2_evbuf_end(port->evbuf);
                 const LV2_Atom* const atom = (const LV2_Atom*)body;
@@ -512 +510 @@
 
     if (protocol == host->atom_prot_id) {
-        printf("ATOM UI WRITE: %d\n", protocol);
-        for (uint32_t i = 0; i < buffer_size; ++i) {
-            printf("%c", ((uint8_t*)buffer)[i]);
-        }
-        printf("\n");
+        SerdNode s   = serd_node_from_string(SERD_BLANK, USTR("msg"));
+        SerdNode p   = serd_node_from_string(SERD_URI, USTR(NS_RDF "value"));
+        char*    str = atom_to_turtle(&host->unmap, &s, &p, (LV2_Atom*)buffer);
+        printf("\n## UI => Plugin ##\n%s\n", str);
+        free(str);
     }
 
@@ -525 +523 @@
     ev->size     = buffer_size;
     memcpy(ev->body, buffer, buffer_size);
-    #if 0
-    printf("WRITE: ");
-    for (uint32_t i = 0; i < sizeof(buf); ++i) {
-        printf("%c", buf[i]);
-    }
-    printf("\n");
-    #endif
     jack_ringbuffer_write(host->ui_events, buf, sizeof(buf));
 }
@@ -544 +535 @@
         char buf[ev.size];
         jack_ringbuffer_read(host->plugin_events, buf, ev.size);
+
+        if (ev.protocol == host->atom_prot_id) {
+            SerdNode s   = serd_node_from_string(SERD_BLANK, USTR("msg"));
+            SerdNode p   = serd_node_from_string(SERD_URI, USTR(NS_RDF "value"));
+            char*    str = atom_to_turtle(&host->unmap, &s, &p, (LV2_Atom*)buf);
+            printf("\n## Plugin => UI ##\n%s\n", str);
+            free(str);
+        }
+
         suil_instance_port_event(host->ui_instance, ev.index,
                                  ev.size, ev.protocol, buf);

trunk/jalv/src/jalv_console.c

@@ -1 +1 @@
 /*
-  Copyright 2007-2011 David Robillard <http://drobilla.net>
+  Copyright 2007-2012 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
@@ -31 +31 @@
     fprintf(os, "  -u UUID      UUID for Jack session restoration\n");
     fprintf(os, "  -l DIR       Load state from save directory\n");
+    fprintf(os, "  -d DIR       Dump plugin <=> UI communication\n");
     return error ? 1 : 0;
 }
@@ -59 +60 @@
             }
             opts->load = jalv_strdup((*argv)[a]);
+        } else if ((*argv)[a][1] == 'd') {
+            opts->dump = true;
         } else {
             fprintf(stderr, "Unknown option %s\n", (*argv)[a]);

trunk/jalv/src/jalv_gtk2.c

@@ -1 +1 @@
 /*
-  Copyright 2007-2011 David Robillard <http://drobilla.net>
+  Copyright 2007-2012 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
@@ -37 +37 @@
         { "load", 'l', 0, G_OPTION_ARG_STRING, &opts->load,
           "Load state from save directory", "DIR" },
+        { "dump", 'd', 0, G_OPTION_ARG_NONE, &opts->dump,
+          "Dump plugin <=> UI communication", NULL },
         { 0, 0, 0, 0, 0, 0, 0 } };
     GError* error = NULL;

trunk/jalv/src/jalv_internal.h

@@ -28 +28 @@
 #include "suil/suil.h"
 
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
@@ -79 +80 @@
     char* uuid;
     char* load;
+    bool  dump;
 } JalvOptions;
 
@@ -190 +192 @@
 jalv_apply_state(Jalv* jalv, LilvState* state);
 
+char*
+atom_to_turtle(LV2_URID_Unmap* unmap,
+               const SerdNode* subject,
+               const SerdNode* predicate,
+               const LV2_Atom* atom);
+
 static inline char*
 jalv_strdup(const char* str)

trunk/jalv/src/symap.c

@@ -1 +1 @@
 /*
-  Copyright 2011 David Robillard <http://drobilla.net>
+  Copyright 2011-2012 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
@@ -173 +173 @@
 symap_unmap(Symap* map, uint32_t id)
 {
-    if (id <= map->size) {
+    if (id == 0) {
+        return NULL;
+    } else if (id <= map->size) {
         return map->symbols[id - 1];
     }

trunk/jalv/wscript

@@ -84 +84 @@
     libs = 'LILV SUIL JACK SERD LV2CORE LV2_EVENT LV2_ATOM LV2_URI_MAP LV2_STATE'
 
-    source = 'src/jalv.c src/symap.c src/state.c src/lv2_evbuf.c'
+    source = 'src/jalv.c src/symap.c src/state.c src/lv2_evbuf.c src/atom_rdf.c'
 
     # Non-GUI version