7 files changed, 23 insertions, 71 deletions
diff --git a/lv2/lv2plug.in/ns/ext/cv-port/cv-port.ttl b/lv2/lv2plug.in/ns/ext/cv-port/cv-port.ttl
deleted file mode 100644
index f90023e..0000000
--- a/lv2/lv2plug.in/ns/ext/cv-port/cv-port.ttl
+++ /dev/null
@@ -1,58 +0,0 @@
-@prefix cv:   <http://lv2plug.in/ns/ext/cv-port#> .
-@prefix doap: <http://usefulinc.com/ns/doap#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix lv2:  <http://lv2plug.in/ns/lv2core#> .
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-
-<http://lv2plug.in/ns/ext/cv-port>
-	a lv2:Specification ;
-	rdfs:seeAlso <../../meta/meta.ttl> ;
-	doap:license <http://opensource.org/licenses/isc> ;
-	doap:name "LV2 CV Port" ;
-	doap:shortdesc "Control Voltage ports for LV2 plugins." ;
-	doap:created "2011-09-25" ;
-	doap:developer <http://drobilla.net/drobilla#me> ;
-	lv2:documentation """
-<p>This extension defines Control Voltage (CV) ports, which are audio-rate
-control ports like those used on classical voltage-controlled synthesizers.
-These ports serve as control ports like <a
-href="http://lv2plug.in/ns/lv2core#ControlPort">lv2:ControlPort</a> but can
-also be used for audio-rate modulation of control signals.  This enables many
-types of processing and synthesis which are not possible with a lower control
-rate.</p>
-""" .
-
-cv:CVPort
-	a rdfs:Class ;
-	rdfs:label "CV Port" ;
-	rdfs:subClassOf lv2:Port ;
-	lv2:documentation """
-<p>Ports of this type have identical semantics to <a
-href="http://lv2plug.in/ns/lv2core#AudioPort">lv2:AudioPort</a> in terms of
-buffer format and connection/input/output logistics.  However, rather than the
-buffer representing audio, the buffer represents audio-rate control data.  A
-CVPort SHOULD have the same properties a <a
-href="http://lv2plug.in/ns/lv2core#ControlPort">lv2:ControlPort</a> typically
-has to describe appropriate control values (e.g.  <a
-href="http://lv2plug.in/ns/lv2core#minimum">lv2:minimum</a>, <a
-href="http://lv2plug.in/ns/lv2core#maximum">lv2:maximum</a>, <a
-href="http://lv2plug.in/ns/lv2core#default">lv2:default</a>)</p>
-
-<p>Hosts SHOULD take care to prevent data from a CVPort port from being used as
-audio except in cases where this is known to be safe.</p>
-
-<p>Example:</p>
-<pre class="turtle-code">
-&lt;http://example.org/some-plugin&gt;
-    lv2:port [
-        a cv:CVPort, lv2:InputPort ;
-        lv2:index 0 ;
-        lv2:minimum -1.0 ;
-        lv2:maximum 1.0 ;
-        lv2:default 0.0 ;
-        lv2:symbol "modulation" ;
-        lv2:name "Modulation" ;
-    ] .
-</pre>
-""" .
diff --git a/lv2/lv2plug.in/ns/ext/cv-port/manifest.ttl b/lv2/lv2plug.in/ns/ext/cv-port/manifest.ttl
deleted file mode 100644
index e5fa145..0000000
--- a/lv2/lv2plug.in/ns/ext/cv-port/manifest.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix lv2:  <http://lv2plug.in/ns/lv2core#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-
-<http://lv2plug.in/ns/ext/cv-port>
-	a lv2:Specification ;
-	lv2:minorVersion 0 ;
-	lv2:microVersion 1 ;
-	rdfs:seeAlso <cv-port.ttl> .
-
diff --git a/lv2/lv2plug.in/ns/ext/cv-port/wscript b/lv2/lv2plug.in/ns/ext/cv-port/wscript
deleted file mode 120000
index 7e2c01b..0000000
--- a/lv2/lv2plug.in/ns/ext/cv-port/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../ext.wscript
-\ No newline at end of file
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2.h b/lv2/lv2plug.in/ns/lv2core/lv2.h
index 42ea819..e86113e 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2.h
+++ b/lv2/lv2plug.in/ns/lv2core/lv2.h
@@ -37,6 +37,7 @@
 #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__CVPort             LV2_CORE_PREFIX "CVPort"
 #define LV2_CORE__ChorusPlugin       LV2_CORE_PREFIX "ChorusPlugin"
 #define LV2_CORE__CombPlugin         LV2_CORE_PREFIX "CombPlugin"
 #define LV2_CORE__CompressorPlugin   LV2_CORE_PREFIX "CompressorPlugin"
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl b/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl
index abdb019..d592f4f 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl
@@ -16,8 +16,8 @@
 		<http://drobilla.net/drobilla#me> ;
 	doap:maintainer <http://drobilla.net/drobilla#me> ;
 	doap:release [
-		doap:revision "6.7" ;
-		doap:created "2012-03-15" ;
+		doap:revision "6.9" ;
+		doap:created "2012-04-13" ;
 		dcs:blame <http://drobilla.net/drobilla#me> ;
 		dcs:changeset [
 			dcs:item [
@@ -30,6 +30,8 @@
 				rdfs:label "Relax the range of lv2:index so it can be used for things other than ports."
 			] , [
 				rdfs:label "Remove lv2:Resource, which turned out to be meaningless."
+			] , [
+				rdfs:label "Add lv2:CVPort."
 			]
 		]
 	] , [
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl b/lv2/lv2plug.in/ns/lv2core/lv2core.ttl
index 3429c41..cc3b9e9 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl
+++ b/lv2/lv2plug.in/ns/lv2core/lv2core.ttl
@@ -263,6 +263,23 @@ lv2:AudioPort
 with elements of C type <code>float</code>.</p>
 """ .
 
+lv2:CVPort
+	a rdfs:Class ,
+		owl:Class ;
+	rdfs:subClassOf lv2:Port ;
+	rdfs:label "CV Port" ;
+	lv2:documentation """
+<p>Ports of this type have the same buffer format as an lv2:AudioPort, except
+the buffer represents audio-rate control data rather than audio.  Like an
+lv2:ControlPort, a CVPort SHOULD have properties describing its value
+(e.g. lv2:minimum, lv2:maximum, and lv2:default), and may be presented to the
+user as a control.</p>
+
+<p>It is generally safe to connect an audio output to a CV input, but not vice
+versa.  Hosts SHOULD take care to prevent data from a CVPort port from being
+used as audio.</p>
+""" .
+
 lv2:port
 	a rdf:Property ,
 		owl:ObjectProperty ;
diff --git a/lv2/lv2plug.in/ns/lv2core/manifest.ttl b/lv2/lv2plug.in/ns/lv2core/manifest.ttl
index 91dc35b..e3678e2 100644
--- a/lv2/lv2plug.in/ns/lv2core/manifest.ttl
+++ b/lv2/lv2plug.in/ns/lv2core/manifest.ttl
@@ -6,6 +6,6 @@
 <http://lv2plug.in/ns/lv2core>
 	a lv2:Specification ;
 	lv2:minorVersion 6 ;
-	lv2:microVersion 7 ;
+	lv2:microVersion 9 ;
 	rdfs:seeAlso <lv2core.ttl> ,
 		<lv2core.doap.ttl> .