Changeset 3987

Timestamp:

2012-02-18 19:34:33 (15 months ago)

Author:

drobilla

Message:

Update for latest LV2 changes.

Location:

trunk

Files:

• jalv/src/atom_rdf.c (modified) (3 diffs)
• jalv/src/jalv.c (modified) (1 diff)
• lilv/src/state.c (modified) (8 diffs)
• lilv/test/lilv_test.c (modified) (1 diff)
• lilv/test/test_plugin.c (modified) (8 diffs)
• plugins/dirg.lv2/src/dirg_lv2.cpp (modified) (1 diff)
• plugins/lolep.lv2/src/object.cpp (modified) (1 diff)
• plugins/lolep.lv2/src/print.cpp (modified) (1 diff)
• plugins/lolep.lv2/src/rdf-read.cpp (modified) (1 diff)
• plugins/lolep.lv2/src/rdf-write.cpp (modified) (1 diff)

trunk/jalv/src/atom_rdf.c

@@ -19 +19 @@
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 
 #include "serd/serd.h"
 
-#define NS_ATOM "http://lv2plug.in/ns/ext/atom#"
-#define NS_XSD  "http://www.w3.org/2001/XMLSchema#"
+#define NS_XSD "http://www.w3.org/2001/XMLSchema#"
 
 #define USTR(str) ((const uint8_t*)str)
@@ -58 +57 @@
     if (atom->type == 0 && atom->size == 0) {
         object = serd_node_from_string(SERD_BLANK, USTR("null"));
-    } else if (!strcmp(type, NS_ATOM "String")) {
+    } else if (!strcmp(type, LV2_ATOM__String)) {
         const uint8_t* str = USTR(LV2_ATOM_BODY(atom));
         object = serd_node_from_string(SERD_LITERAL, str);
-    } else if (!strcmp(type, NS_ATOM "URID")) {
+    } else if (!strcmp(type, LV2_ATOM__URID)) {
         const uint32_t id  = *(const uint32_t*)LV2_ATOM_BODY(atom);
         const uint8_t* str = USTR(unmap->unmap(unmap->handle, id));
         object = serd_node_from_string(SERD_URI, str);
-    } else if (!strcmp(type, NS_ATOM "URI")) {
+    } else if (!strcmp(type, LV2_ATOM__Path)) {
+        const uint8_t* str = USTR(LV2_ATOM_BODY(atom));
+        object = serd_node_from_string(SERD_LITERAL, str);
+        datatype = serd_node_from_string(SERD_URI, USTR(LV2_ATOM__Path));
+    } else if (!strcmp(type, LV2_ATOM__URI)) {
         const uint8_t* str = USTR(LV2_ATOM_BODY(atom));
         object = serd_node_from_string(SERD_URI, str);
-    } else if (!strcmp(type, NS_ATOM "Int32")) {
+    } else if (!strcmp(type, LV2_ATOM__Int32)) {
         new_node = true;
         object   = serd_node_new_integer(*(int32_t*)LV2_ATOM_BODY(atom));
         datatype = serd_node_from_string(SERD_URI, USTR(NS_XSD "integer"));
-    } else if (!strcmp(type, NS_ATOM "Float")) {
+    } else if (!strcmp(type, LV2_ATOM__Float)) {
         new_node = true;
         object   = serd_node_new_decimal(*(float*)LV2_ATOM_BODY(atom), 8);
         datatype = serd_node_from_string(SERD_URI, USTR(NS_XSD "decimal"));
-    } else if (!strcmp(type, NS_ATOM "Double")) {
+    } else if (!strcmp(type, LV2_ATOM__Double)) {
         new_node = true;
         object   = serd_node_new_decimal(*(float*)LV2_ATOM_BODY(atom), 16);
         datatype = serd_node_from_string(SERD_URI, USTR(NS_XSD "decimal"));
-    } else if (!strcmp(type, NS_ATOM "Bool")) {
+    } else if (!strcmp(type, LV2_ATOM__Bool)) {
         new_node = true;
         datatype = serd_node_from_string(SERD_URI, USTR(NS_XSD "boolean"));
@@ -88 +91 @@
             object = serd_node_from_string(SERD_LITERAL, USTR("false"));
         }
-    } else if (!strcmp(type, NS_ATOM "Blank")) {
+    } else if (!strcmp(type, LV2_ATOM__Blank)) {
         const LV2_Atom_Object* obj = (const LV2_Atom_Object*)atom;
         SerdNode idnum = serd_node_new_integer(obj->id);

trunk/jalv/src/jalv.c

@@ -92 +92 @@
 static LV2_Feature unmap_feature     = { NS_EXT "urid#unmap", NULL };
 static LV2_Feature instance_feature  = { NS_EXT "instance-access", NULL };
-static LV2_Feature make_path_feature = { LV2_STATE_MAKE_PATH_URI, NULL };
+static LV2_Feature make_path_feature = { LV2_STATE__makePath, NULL };
 
 #ifdef HAVE_LV2_UI_RESIZE

trunk/lilv/src/state.c

@@ -23 +23 @@
 
 #ifdef HAVE_LV2_STATE
+#    include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #    include "lv2/lv2plug.in/ns/ext/state/state.h"
 #endif
@@ -345 +346 @@
 
 #ifdef HAVE_LV2_STATE
-    state->state_Path = map->map(map->handle, LV2_STATE_PATH_URI);
+    state->state_Path = map->map(map->handle, LV2_ATOM__Path);
     LV2_State_Map_Path  pmap          = { state, abstract_path, absolute_path };
-    LV2_Feature         pmap_feature  = { LV2_STATE_MAP_PATH_URI, &pmap };
+    LV2_Feature         pmap_feature  = { LV2_STATE__mapPath, &pmap };
     LV2_State_Make_Path pmake         = { state, make_path };
-    LV2_Feature         pmake_feature = { LV2_STATE_MAKE_PATH_URI, &pmake };
+    LV2_Feature         pmake_feature = { LV2_STATE__makePath, &pmake };
     features = sfeatures = add_features(features, &pmap_feature,
                                         save_dir ? &pmake_feature : NULL);
@@ -374 +375 @@
     const LV2_Descriptor*      desc  = instance->lv2_descriptor;
     const LV2_State_Interface* iface = (desc->extension_data)
-        ? (LV2_State_Interface*)desc->extension_data(LV2_STATE_INTERFACE_URI)
+        ? (LV2_State_Interface*)desc->extension_data(LV2_STATE__Interface)
         : NULL;
 
@@ -402 +403 @@
     LV2_State_Map_Path map_path = {
         (LilvState*)state, abstract_path, absolute_path };
-    LV2_Feature map_feature = { LV2_STATE_MAP_PATH_URI, &map_path };
+    LV2_Feature map_feature = { LV2_STATE__mapPath, &map_path };
 
     const LV2_Feature** sfeatures = add_features(features, &map_feature, NULL);
@@ -409 +410 @@
     const LV2_Descriptor*      desc  = instance->lv2_descriptor;
     const LV2_State_Interface* iface = (desc->extension_data)
-        ? (LV2_State_Interface*)desc->extension_data(LV2_STATE_INTERFACE_URI)
+        ? (LV2_State_Interface*)desc->extension_data(LV2_STATE__Interface)
         : NULL;
 
@@ -497 +498 @@
 
 #ifdef HAVE_LV2_STATE
-    state->state_Path = map->map(map->handle, LV2_STATE_PATH_URI);
+    state->state_Path = map->map(map->handle, LV2_ATOM__Path);
 #endif
 
@@ -561 +562 @@
 #ifdef HAVE_LV2_STATE
     SordNode* state_path_node = sord_new_uri(world->world,
-                                             USTR(LV2_STATE_PATH_URI));
+                                             USTR(LV2_ATOM__Path));
 #endif
 
@@ -600 +601 @@
                                         state_path_node)) {
                 prop.size  = strlen((const char*)sord_node_get_string(o)) + 1;
-                prop.type  = map->map(map->handle, LV2_STATE_PATH_URI);
+                prop.type  = map->map(map->handle, LV2_ATOM__Path);
                 prop.flags = LV2_STATE_IS_PORTABLE;
                 prop.value = lilv_path_join(

trunk/lilv/test/lilv_test.c

@@ -1243 +1243 @@
 
     LV2_State_Make_Path make_path         = { NULL, lilv_make_path };
-    LV2_Feature         make_path_feature = { LV2_STATE_MAKE_PATH_URI, &make_path };
+    LV2_Feature         make_path_feature = { LV2_STATE__makePath, &make_path };
     const LV2_Feature*  ffeatures[]       = { &make_path_feature, &map_feature, NULL };
 

trunk/lilv/test/test_plugin.c

@@ -23 +23 @@
 #include <string.h>
 
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
@@ -110 +111 @@
             test->uris.atom_Float = test->map->map(
                 test->map->handle, NS_ATOM "Float");
-        } else if (!strcmp(features[i]->URI, LV2_STATE_MAKE_PATH_URI)) {
+        } else if (!strcmp(features[i]->URI, LV2_STATE__makePath)) {
             make_path = (LV2_State_Make_Path*)features[i]->data;
         }
@@ -169 +170 @@
     LV2_State_Make_Path* make_path = NULL;
     for (int i = 0; features && features[i]; ++i) {
-        if (!strcmp(features[i]->URI, LV2_STATE_MAP_PATH_URI)) {
+        if (!strcmp(features[i]->URI, LV2_STATE__mapPath)) {
             map_path = (LV2_State_Map_Path*)features[i]->data;
-        } else if (!strcmp(features[i]->URI, LV2_STATE_MAKE_PATH_URI)) {
+        } else if (!strcmp(features[i]->URI, LV2_STATE__makePath)) {
             make_path = (LV2_State_Make_Path*)features[i]->data;
         }
@@ -248 +249 @@
               apath,
               strlen(apath) + 1,
-              map_uri(plugin, LV2_STATE_PATH_URI),
+              map_uri(plugin, LV2_ATOM__Path),
               LV2_STATE_IS_PORTABLE);
 
@@ -263 +264 @@
                   apath,
                   strlen(apath) + 1,
-                  map_uri(plugin, LV2_STATE_PATH_URI),
+                  map_uri(plugin, LV2_ATOM__Path),
                   LV2_STATE_IS_PORTABLE);
 
@@ -280 +281 @@
                   apath,
                   strlen(apath) + 1,
-                  map_uri(plugin, LV2_STATE_PATH_URI),
+                  map_uri(plugin, LV2_ATOM__Path),
                   LV2_STATE_IS_PORTABLE);
             free(apath);
@@ -298 +299 @@
     LV2_State_Map_Path* map_path = NULL;
     for (int i = 0; features && features[i]; ++i) {
-        if (!strcmp(features[i]->URI, LV2_STATE_MAP_PATH_URI)) {
+        if (!strcmp(features[i]->URI, LV2_STATE__mapPath)) {
             map_path = (LV2_State_Map_Path*)features[i]->data;
         }
@@ -351 +352 @@
 {
     static const LV2_State_Interface state = { save, restore };
-    if (!strcmp(uri, LV2_STATE_INTERFACE_URI)) {
+    if (!strcmp(uri, LV2_STATE__Interface)) {
         return &state;
     }

trunk/plugins/dirg.lv2/src/dirg_lv2.cpp

@@ -22 +22 @@
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"

trunk/plugins/lolep.lv2/src/object.cpp

@@ -24 +24 @@
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+
+#include "LV2Extensions.hpp"
+#include "LV2Plugin.hpp"
 #include "lolep.hpp"
-#include "LV2Plugin.hpp"
-#include "LV2Extensions.hpp"
 
 using namespace std;

trunk/plugins/lolep.lv2/src/print.cpp

@@ -20 +20 @@
 #include <ctype.h>
 #include <stdio.h>
+
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
+#include "lv2/lv2plug.in/ns/ext/event/event.h"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
+
+#include "LV2Extensions.hpp"
+#include "LV2Plugin.hpp"
 #include "lolep.hpp"
-#include "LV2Plugin.hpp"
-#include "LV2Extensions.hpp"
 
 using namespace std;

trunk/plugins/lolep.lv2/src/rdf-read.cpp

@@ -29 +29 @@
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"

trunk/plugins/lolep.lv2/src/rdf-write.cpp

@@ -25 +25 @@
 #include "serd/serd.h"
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom-helpers.h"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"