Implement consistent URI defines in core, state, atom, urid.

1 files changed, 37 insertions, 36 deletions

diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.h b/lv2/lv2plug.in/ns/ext/atom/atom.h
index 70f14f8..22eac5c 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.h
+++ b/lv2/lv2plug.in/ns/ext/atom/atom.h
@@ -25,42 +25,43 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define LV2_ATOM_URI "http://lv2plug.in/ns/ext/atom"
-
-#define LV2_ATOM__Atom          LV2_ATOM_URI "#Atom"
-#define LV2_ATOM__AtomPort      LV2_ATOM_URI "#AtomPort"
-#define LV2_ATOM__AudioFrames   LV2_ATOM_URI "#AudioFrames"
-#define LV2_ATOM__Beats         LV2_ATOM_URI "#Beats"
-#define LV2_ATOM__Blank         LV2_ATOM_URI "#Blank"
-#define LV2_ATOM__Bool          LV2_ATOM_URI "#Bool"
-#define LV2_ATOM__Chunk         LV2_ATOM_URI "#Chunk"
-#define LV2_ATOM__Double        LV2_ATOM_URI "#Double"
-#define LV2_ATOM__Event         LV2_ATOM_URI "#Event"
-#define LV2_ATOM__Float         LV2_ATOM_URI "#Float"
-#define LV2_ATOM__Int32         LV2_ATOM_URI "#Int32"
-#define LV2_ATOM__Int64         LV2_ATOM_URI "#Int64"
-#define LV2_ATOM__Literal       LV2_ATOM_URI "#Literal"
-#define LV2_ATOM__MessagePort   LV2_ATOM_URI "#MessagePort"
-#define LV2_ATOM__Number        LV2_ATOM_URI "#Number"
-#define LV2_ATOM__Object        LV2_ATOM_URI "#Object"
-#define LV2_ATOM__Path          LV2_ATOM_URI "#Path"
-#define LV2_ATOM__Property      LV2_ATOM_URI "#Property"
-#define LV2_ATOM__Resource      LV2_ATOM_URI "#Resource"
-#define LV2_ATOM__Sequence      LV2_ATOM_URI "#Sequence"
-#define LV2_ATOM__String        LV2_ATOM_URI "#String"
-#define LV2_ATOM__TimeUnit      LV2_ATOM_URI "#TimeUnit"
-#define LV2_ATOM__Tuple         LV2_ATOM_URI "#Tuple"
-#define LV2_ATOM__URI           LV2_ATOM_URI "#URI"
-#define LV2_ATOM__URID          LV2_ATOM_URI "#URID"
-#define LV2_ATOM__ValuePort     LV2_ATOM_URI "#ValuePort"
-#define LV2_ATOM__Vector        LV2_ATOM_URI "#Vector"
-#define LV2_ATOM__beatTime      LV2_ATOM_URI "#beatTime"
-#define LV2_ATOM__bufferType    LV2_ATOM_URI "#bufferType"
-#define LV2_ATOM__childType     LV2_ATOM_URI "#childType"
-#define LV2_ATOM__eventTransfer LV2_ATOM_URI "#eventTransfer"
-#define LV2_ATOM__frameTime     LV2_ATOM_URI "#frameTime"
-#define LV2_ATOM__supports      LV2_ATOM_URI "#supports"
-#define LV2_ATOM__timeUnit      LV2_ATOM_URI "#timeUnit"
+#define LV2_ATOM_URI    "http://lv2plug.in/ns/ext/atom"
+#define LV2_ATOM_PREFIX LV2_ATOM_URI "#"
+
+#define LV2_ATOM__Atom          LV2_ATOM_PREFIX "Atom"
+#define LV2_ATOM__AtomPort      LV2_ATOM_PREFIX "AtomPort"
+#define LV2_ATOM__AudioFrames   LV2_ATOM_PREFIX "AudioFrames"
+#define LV2_ATOM__Beats         LV2_ATOM_PREFIX "Beats"
+#define LV2_ATOM__Blank         LV2_ATOM_PREFIX "Blank"
+#define LV2_ATOM__Bool          LV2_ATOM_PREFIX "Bool"
+#define LV2_ATOM__Chunk         LV2_ATOM_PREFIX "Chunk"
+#define LV2_ATOM__Double        LV2_ATOM_PREFIX "Double"
+#define LV2_ATOM__Event         LV2_ATOM_PREFIX "Event"
+#define LV2_ATOM__Float         LV2_ATOM_PREFIX "Float"
+#define LV2_ATOM__Int32         LV2_ATOM_PREFIX "Int32"
+#define LV2_ATOM__Int64         LV2_ATOM_PREFIX "Int64"
+#define LV2_ATOM__Literal       LV2_ATOM_PREFIX "Literal"
+#define LV2_ATOM__MessagePort   LV2_ATOM_PREFIX "MessagePort"
+#define LV2_ATOM__Number        LV2_ATOM_PREFIX "Number"
+#define LV2_ATOM__Object        LV2_ATOM_PREFIX "Object"
+#define LV2_ATOM__Path          LV2_ATOM_PREFIX "Path"
+#define LV2_ATOM__Property      LV2_ATOM_PREFIX "Property"
+#define LV2_ATOM__Resource      LV2_ATOM_PREFIX "Resource"
+#define LV2_ATOM__Sequence      LV2_ATOM_PREFIX "Sequence"
+#define LV2_ATOM__String        LV2_ATOM_PREFIX "String"
+#define LV2_ATOM__TimeUnit      LV2_ATOM_PREFIX "TimeUnit"
+#define LV2_ATOM__Tuple         LV2_ATOM_PREFIX "Tuple"
+#define LV2_ATOM__URI           LV2_ATOM_PREFIX "URI"
+#define LV2_ATOM__URID          LV2_ATOM_PREFIX "URID"
+#define LV2_ATOM__ValuePort     LV2_ATOM_PREFIX "ValuePort"
+#define LV2_ATOM__Vector        LV2_ATOM_PREFIX "Vector"
+#define LV2_ATOM__beatTime      LV2_ATOM_PREFIX "beatTime"
+#define LV2_ATOM__bufferType    LV2_ATOM_PREFIX "bufferType"
+#define LV2_ATOM__childType     LV2_ATOM_PREFIX "childType"
+#define LV2_ATOM__eventTransfer LV2_ATOM_PREFIX "eventTransfer"
+#define LV2_ATOM__frameTime     LV2_ATOM_PREFIX "frameTime"
+#define LV2_ATOM__supports      LV2_ATOM_PREFIX "supports"
+#define LV2_ATOM__timeUnit      LV2_ATOM_PREFIX "timeUnit"
 
 #define LV2_ATOM_REFERENCE_TYPE 0