From e5600d750ffd32b3f5760616a197240acdfc1f46 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 11 Mar 2012 19:55:54 +0000 Subject: Implement consistent URI defines in core, state, atom, urid. --- lv2/lv2plug.in/ns/ext/atom/atom.h | 73 ++++++++++++------------- lv2/lv2plug.in/ns/ext/state/state.h | 17 +++--- lv2/lv2plug.in/ns/ext/urid/urid.h | 12 +++-- lv2/lv2plug.in/ns/lv2core/lv2.h | 86 +++++++++++++++++++++++++++++- lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl | 4 +- lv2/lv2plug.in/ns/lv2core/lv2core.ttl | 2 +- lv2/lv2plug.in/ns/lv2core/manifest.ttl | 2 +- 7 files changed, 144 insertions(+), 52 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 #include -#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 diff --git a/lv2/lv2plug.in/ns/ext/state/state.h b/lv2/lv2plug.in/ns/ext/state/state.h index 2ab731d..2f5af22 100644 --- a/lv2/lv2plug.in/ns/ext/state/state.h +++ b/lv2/lv2plug.in/ns/ext/state/state.h @@ -28,20 +28,21 @@ #include "lv2/lv2plug.in/ns/lv2core/lv2.h" +#define LV2_STATE_URI "http://lv2plug.in/ns/ext/state" +#define LV2_STATE_PREFIX LV2_STATE_URI "#" + +#define LV2_STATE__Interface LV2_STATE_PREFIX "Interface" +#define LV2_STATE__State LV2_STATE_PREFIX "State" +#define LV2_STATE__makePath LV2_STATE_PREFIX "makePath" +#define LV2_STATE__mapPath LV2_STATE_PREFIX "mapPath" +#define LV2_STATE__state LV2_STATE_PREFIX "state" + #ifdef __cplusplus extern "C" { #else # include #endif -#define LV2_STATE_URI "http://lv2plug.in/ns/ext/state" - -#define LV2_STATE__Interface LV2_STATE_URI "#Interface" -#define LV2_STATE__State LV2_STATE_URI "#State" -#define LV2_STATE__makePath LV2_STATE_URI "#makePath" -#define LV2_STATE__mapPath LV2_STATE_URI "#mapPath" -#define LV2_STATE__state LV2_STATE_URI "#state" - typedef void* LV2_State_Handle; typedef void* LV2_State_Map_Path_Handle; typedef void* LV2_State_Make_Path_Handle; diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.h b/lv2/lv2plug.in/ns/ext/urid/urid.h index 22c9a66..edf047f 100644 --- a/lv2/lv2plug.in/ns/ext/urid/urid.h +++ b/lv2/lv2plug.in/ns/ext/urid/urid.h @@ -23,9 +23,15 @@ #ifndef LV2_URID_H #define LV2_URID_H -#define LV2_URID_URI "http://lv2plug.in/ns/ext/urid" -#define LV2_URID_MAP_URI LV2_URID_URI "#map" -#define LV2_URID_UNMAP_URI LV2_URID_URI "#unmap" +#define LV2_URID_URI "http://lv2plug.in/ns/ext/urid" +#define LV2_URID_PREFIX LV2_URID_URI "#" + +#define LV2_URID__map LV2_URID_PREFIX "map" +#define LV2_URID__unmap LV2_URID_PREFIX "unmap" + +/* Legacy defines */ +#define LV2_URID_MAP_URI LV2_URID__map +#define LV2_URID_UNMAP_URI LV2_URID__unmap #include diff --git a/lv2/lv2plug.in/ns/lv2core/lv2.h b/lv2/lv2plug.in/ns/lv2core/lv2.h index 29adf7b..9df9ac1 100644 --- a/lv2/lv2plug.in/ns/lv2core/lv2.h +++ b/lv2/lv2plug.in/ns/lv2core/lv2.h @@ -21,7 +21,7 @@ /** @file lv2.h API for the LV2 specification . - Revision: 6.1 + Revision: 6.5 */ #ifndef LV2_H_INCLUDED @@ -29,6 +29,90 @@ #include +#define LV2_CORE_URI "http://lv2plug.in/ns/lv2core" +#define LV2_CORE_PREFIX LV2_CORE_URI "#" + +#define LV2_CORE__AllpassPlugin LV2_CORE_PREFIX "AllpassPlugin" +#define LV2_CORE__AmplifierPlugin LV2_CORE_PREFIX "AmplifierPlugin" +#define LV2_CORE__AnalyserPlugin LV2_CORE_PREFIX "AnalyserPlugin" +#define LV2_CORE__AudioPort LV2_CORE_PREFIX "AudioPort" +#define LV2_CORE__BandpassPlugin LV2_CORE_PREFIX "BandpassPlugin" +#define LV2_CORE__ChorusPlugin LV2_CORE_PREFIX "ChorusPlugin" +#define LV2_CORE__CombPlugin LV2_CORE_PREFIX "CombPlugin" +#define LV2_CORE__CompressorPlugin LV2_CORE_PREFIX "CompressorPlugin" +#define LV2_CORE__ConstantPlugin LV2_CORE_PREFIX "ConstantPlugin" +#define LV2_CORE__ControlPort LV2_CORE_PREFIX "ControlPort" +#define LV2_CORE__ConverterPlugin LV2_CORE_PREFIX "ConverterPlugin" +#define LV2_CORE__DelayPlugin LV2_CORE_PREFIX "DelayPlugin" +#define LV2_CORE__DistortionPlugin LV2_CORE_PREFIX "DistortionPlugin" +#define LV2_CORE__DynamicsPlugin LV2_CORE_PREFIX "DynamicsPlugin" +#define LV2_CORE__EQPlugin LV2_CORE_PREFIX "EQPlugin" +#define LV2_CORE__ExpanderPlugin LV2_CORE_PREFIX "ExpanderPlugin" +#define LV2_CORE__ExtensionData LV2_CORE_PREFIX "ExtensionData" +#define LV2_CORE__Feature LV2_CORE_PREFIX "Feature" +#define LV2_CORE__FilterPlugin LV2_CORE_PREFIX "FilterPlugin" +#define LV2_CORE__FlangerPlugin LV2_CORE_PREFIX "FlangerPlugin" +#define LV2_CORE__FunctionPlugin LV2_CORE_PREFIX "FunctionPlugin" +#define LV2_CORE__GatePlugin LV2_CORE_PREFIX "GatePlugin" +#define LV2_CORE__GeneratorPlugin LV2_CORE_PREFIX "GeneratorPlugin" +#define LV2_CORE__HighpassPlugin LV2_CORE_PREFIX "HighpassPlugin" +#define LV2_CORE__InputPort LV2_CORE_PREFIX "InputPort" +#define LV2_CORE__InstrumentPlugin LV2_CORE_PREFIX "InstrumentPlugin" +#define LV2_CORE__LimiterPlugin LV2_CORE_PREFIX "LimiterPlugin" +#define LV2_CORE__LowpassPlugin LV2_CORE_PREFIX "LowpassPlugin" +#define LV2_CORE__MixerPlugin LV2_CORE_PREFIX "MixerPlugin" +#define LV2_CORE__ModulatorPlugin LV2_CORE_PREFIX "ModulatorPlugin" +#define LV2_CORE__MultiEQPlugin LV2_CORE_PREFIX "MultiEQPlugin" +#define LV2_CORE__OscillatorPlugin LV2_CORE_PREFIX "OscillatorPlugin" +#define LV2_CORE__OutputPort LV2_CORE_PREFIX "OutputPort" +#define LV2_CORE__ParaEQPlugin LV2_CORE_PREFIX "ParaEQPlugin" +#define LV2_CORE__PhaserPlugin LV2_CORE_PREFIX "PhaserPlugin" +#define LV2_CORE__PitchPlugin LV2_CORE_PREFIX "PitchPlugin" +#define LV2_CORE__Plugin LV2_CORE_PREFIX "Plugin" +#define LV2_CORE__PluginBase LV2_CORE_PREFIX "PluginBase" +#define LV2_CORE__Point LV2_CORE_PREFIX "Point" +#define LV2_CORE__Port LV2_CORE_PREFIX "Port" +#define LV2_CORE__PortProperty LV2_CORE_PREFIX "PortProperty" +#define LV2_CORE__Resource LV2_CORE_PREFIX "Resource" +#define LV2_CORE__ReverbPlugin LV2_CORE_PREFIX "ReverbPlugin" +#define LV2_CORE__ScalePoint LV2_CORE_PREFIX "ScalePoint" +#define LV2_CORE__SimulatorPlugin LV2_CORE_PREFIX "SimulatorPlugin" +#define LV2_CORE__SpatialPlugin LV2_CORE_PREFIX "SpatialPlugin" +#define LV2_CORE__Specification LV2_CORE_PREFIX "Specification" +#define LV2_CORE__SpectralPlugin LV2_CORE_PREFIX "SpectralPlugin" +#define LV2_CORE__UtilityPlugin LV2_CORE_PREFIX "UtilityPlugin" +#define LV2_CORE__WaveshaperPlugin LV2_CORE_PREFIX "WaveshaperPlugin" +#define LV2_CORE__appliesTo LV2_CORE_PREFIX "appliesTo" +#define LV2_CORE__binary LV2_CORE_PREFIX "binary" +#define LV2_CORE__connectionOptional LV2_CORE_PREFIX "connectionOptional" +#define LV2_CORE__default LV2_CORE_PREFIX "default" +#define LV2_CORE__documentation LV2_CORE_PREFIX "documentation" +#define LV2_CORE__enumeration LV2_CORE_PREFIX "enumeration" +#define LV2_CORE__extensionData LV2_CORE_PREFIX "extensionData" +#define LV2_CORE__freeWheeling LV2_CORE_PREFIX "freeWheeling" +#define LV2_CORE__hardRTCapable LV2_CORE_PREFIX "hardRTCapable" +#define LV2_CORE__hasParameter LV2_CORE_PREFIX "hasParameter" +#define LV2_CORE__inPlaceBroken LV2_CORE_PREFIX "inPlaceBroken" +#define LV2_CORE__index LV2_CORE_PREFIX "index" +#define LV2_CORE__integer LV2_CORE_PREFIX "integer" +#define LV2_CORE__isLive LV2_CORE_PREFIX "isLive" +#define LV2_CORE__isParameter LV2_CORE_PREFIX "isParameter" +#define LV2_CORE__latency LV2_CORE_PREFIX "latency" +#define LV2_CORE__maximum LV2_CORE_PREFIX "maximum" +#define LV2_CORE__microVersion LV2_CORE_PREFIX "microVersion" +#define LV2_CORE__minimum LV2_CORE_PREFIX "minimum" +#define LV2_CORE__minorVersion LV2_CORE_PREFIX "minorVersion" +#define LV2_CORE__name LV2_CORE_PREFIX "name" +#define LV2_CORE__optionalFeature LV2_CORE_PREFIX "optionalFeature" +#define LV2_CORE__port LV2_CORE_PREFIX "port" +#define LV2_CORE__portProperty LV2_CORE_PREFIX "portProperty" +#define LV2_CORE__reportsLatency LV2_CORE_PREFIX "reportsLatency" +#define LV2_CORE__requiredFeature LV2_CORE_PREFIX "requiredFeature" +#define LV2_CORE__sampleRate LV2_CORE_PREFIX "sampleRate" +#define LV2_CORE__scalePoint LV2_CORE_PREFIX "scalePoint" +#define LV2_CORE__symbol LV2_CORE_PREFIX "symbol" +#define LV2_CORE__toggled LV2_CORE_PREFIX "toggled" + #ifdef __cplusplus extern "C" { #endif diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl b/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl index 25fbd6f..41958a8 100644 --- a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl +++ b/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl @@ -25,8 +25,8 @@ doap:shortdesc "An audio plugin interface specification." ; doap:programming-language "C" ; doap:release [ - doap:revision "6.3" ; - doap:created "2012-02-27" ; + doap:revision "6.5" ; + doap:created "2012-03-10" ; dcs:blame ; dcs:changeset [ dcs:item [ diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl b/lv2/lv2plug.in/ns/lv2core/lv2core.ttl index b387910..57f4fc8 100644 --- a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl +++ b/lv2/lv2plug.in/ns/lv2core/lv2core.ttl @@ -1,7 +1,7 @@ # This document describes LV2, a plugin interface. # See for more information. # -# Copyright 2006-2011 Steve Harris, David Robillard +# Copyright 2006-2012 Steve Harris, David Robillard # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/lv2/lv2plug.in/ns/lv2core/manifest.ttl b/lv2/lv2plug.in/ns/lv2core/manifest.ttl index f96a206..9837ba5 100644 --- a/lv2/lv2plug.in/ns/lv2core/manifest.ttl +++ b/lv2/lv2plug.in/ns/lv2core/manifest.ttl @@ -6,5 +6,5 @@ a doap:Project , lv2:Specification , owl:Ontology ; lv2:minorVersion 6 ; - lv2:microVersion 3 ; + lv2:microVersion 5 ; rdfs:seeAlso , . \ No newline at end of file -- cgit v1.2.1