From 6a07bd4ef2ddbf7c9c137fbf40c0774b419dcb9c Mon Sep 17 00:00:00 2001
From: Holger Wirtz <dcoredump@googlemail.com>
Date: Thu, 15 Dec 2016 09:54:26 +0000
Subject: [PATCH] Seperate modgui.ttl. Enumerations for some parameters in
 Dexed.ttl.

---
 src/Dexed.ttl    | 345 ++++++++++++++++++++++++++++++++++++++++++-----
 src/Makefile     |   2 +-
 src/manifest.ttl |  36 +----
 src/modgui.ttl   |  33 +++++
 4 files changed, 350 insertions(+), 66 deletions(-)
 create mode 100644 src/modgui.ttl

diff --git a/src/Dexed.ttl b/src/Dexed.ttl
index 1c7ac94..5df1ac9 100644
--- a/src/Dexed.ttl
+++ b/src/Dexed.ttl
@@ -182,7 +182,32 @@
         lv2:default 4 ;
         lv2:minimum 0 ;
         lv2:maximum 5 ;
-	lv2:portProperty lv2:integer ;
+	lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Triangle" ;
+            rdfs:comment "Triangle" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Saw-Down" ;
+            rdfs:comment "Saw-Down" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "Saw-Up" ;
+            rdfs:comment "Saw-Up" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "Square" ;
+            rdfs:comment "Square" ;
+        ], [
+            rdf:value 4 ;
+            rdfs:label "Sine" ;
+            rdfs:comment "Sine" ;
+        ], [
+            rdf:value 6 ;
+            rdfs:label "Sample & Hold" ;
+            rdfs:comment "Sample & Hold" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -382,7 +407,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+	lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -452,7 +486,24 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+	lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -462,7 +513,24 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+	lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -592,7 +660,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -658,21 +735,55 @@
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 63 ;
         lv2:symbol "op2_kbd_lev_scl_lft_curve" ;
-        lv2:name "OP2 L KEY SCALE" ;
+        lv2:name "OP2 L KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+	lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 64 ;
         lv2:symbol "op2_kbd_lev_scl_rht_curve" ;
-        lv2:name "OP2 R KEY SCALE" ;
+        lv2:name "OP2 R KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -802,7 +913,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -868,21 +988,55 @@
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 84 ;
         lv2:symbol "op3_kbd_lev_scl_lft_curve" ;
-        lv2:name "OP3 L KEY SCALE" ;
+        lv2:name "OP3 L KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 85 ;
         lv2:symbol "op3_kbd_lev_scl_rht_curve" ;
-        lv2:name "OP3 R KEY SCALE" ;
+        lv2:name "OP3 R KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1012,7 +1166,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1078,21 +1241,55 @@
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 105 ;
         lv2:symbol "op4_kbd_lev_scl_lft_curve" ;
-        lv2:name "OP4 L KEY SCALE" ;
+        lv2:name "OP4 L KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
-        lv2:maximum 99 ;
-	lv2:portProperty lv2:integer ;
+        lv2:maximum 3 ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 106 ;
         lv2:symbol "op4_kbd_lev_scl_rht_curve" ;
-        lv2:name "OP4 R KEY SCALE" ;
+        lv2:name "OP4 R KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
-        lv2:maximum 99 ;
-	lv2:portProperty lv2:integer ;
+        lv2:maximum 3 ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1222,7 +1419,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1288,21 +1494,55 @@
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 126 ;
         lv2:symbol "op5_kbd_lev_scl_lft_curve" ;
-        lv2:name "OP5 L KEY SCALE" ;
+        lv2:name "OP5 L KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 127 ;
         lv2:symbol "op5_kbd_lev_scl_rht_curve" ;
-        lv2:name "OP5 R KEY SCALE" ;
+        lv2:name "OP5 R KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1432,7 +1672,16 @@
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 1 ;
-	lv2:portProperty lv2:toggled, lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "Ratio" ;
+            rdfs:comment "Ratio" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "Fixed" ;
+            rdfs:comment "Fixed" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
@@ -1498,21 +1747,55 @@
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 147 ;
         lv2:symbol "op6_kbd_lev_scl_lft_curve" ;
-        lv2:name "OP6 L KEY SCALE" ;
+        lv2:name "OP6 L KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
         lv2:index 148 ;
         lv2:symbol "op6_kbd_lev_scl_rht_curve" ;
-        lv2:name "OP6 R KEY SCALE" ;
+        lv2:name "OP6 R KEY CURVE" ;
         lv2:default 0 ;
         lv2:minimum 0 ;
         lv2:maximum 3 ;
-	lv2:portProperty lv2:integer ;
+        lv2:portProperty lv2:enumeration, lv2:integer ;
+        lv2:scalePoint [
+            rdf:value 0 ;
+            rdfs:label "-LIN" ;
+            rdfs:comment "-LIN" ;
+        ], [
+            rdf:value 1 ;
+            rdfs:label "-EXP" ;
+            rdfs:comment "-EXP" ;
+        ], [
+            rdf:value 2 ;
+            rdfs:label "+EXP" ;
+            rdfs:comment "+EXP" ;
+        ], [
+            rdf:value 3 ;
+            rdfs:label "+LIN" ;
+            rdfs:comment "+LIN" ;
+        ];
     ] ,
     [
         a lv2:InputPort, lv2:ControlPort ;
diff --git a/src/Makefile b/src/Makefile
index 4dd054b..d7ce340 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -57,7 +57,7 @@ install: $(BUNDLE)
 	rm -rf ${HOME}/.lv2/$(BUNDLE)
 	cp -R $(BUNDLE) $(INSTALL_DIR)
 
-$(BUNDLE): manifest.ttl Dexed.ttl presets.ttl dexed.so
+$(BUNDLE): manifest.ttl Dexed.ttl modgui.ttl presets.ttl dexed.so
 	rm -rf $(BUNDLE)
 	mkdir $(BUNDLE)
 	cp $^ $(BUNDLE)
diff --git a/src/manifest.ttl b/src/manifest.ttl
index 84da7f3..3cba924 100644
--- a/src/manifest.ttl
+++ b/src/manifest.ttl
@@ -5,44 +5,12 @@
 @prefix mdap: <http://moddevices.com/plugins/mda/presets#> .
 @prefix pset: <http://lv2plug.in/ns/ext/presets#> .
 @prefix doap: <http://usefulinc.com/ns/doap#> .
-@prefix modgui: <http://moddevices.com/ns/modgui#> .
 
 <https://github.com/dcoredump/dexed.lv2>
     a lv2:Plugin ;
     doap:name "Dexed";
-    rdfs:seeAlso <Dexed.ttl> .
-
-<https://github.com/dcoredump/dexed.lv2>
-    modgui:gui [
-        modgui:resourcesDirectory <modgui> ;
-        modgui:iconTemplate <modgui/icon-dexed.html> ;
-        modgui:stylesheet <modgui/stylesheet-dexed.css> ;
-        modgui:screenshot <modgui/screenshot-dexed.png> ;
-        modgui:thumbnail <modgui/thumbnail-dexed.png> ;
-        modgui:brand "dcoredump" ;
-        modgui:label "Dexed" ;
-        modgui:model "japanese" ;
-        modgui:panel "4-knobs" ;
-        modgui:color "black" ;
-        modgui:knob "racing" ;
-        modgui:port [
-            lv2:index 0 ;
-            lv2:symbol "output" ;
-            lv2:name "Output" ;
-        ] , [
-            lv2:index 1 ;
-            lv2:symbol "engine" ;
-            lv2:name "Engine" ;
-        ] , [
-            lv2:index 2 ;
-            lv2:symbol "cutoff" ;
-            lv2:name "Cutoff" ;
-        ] , [
-            lv2:index 3 ;
-            lv2:symbol "resonance" ;
-            lv2:name "Resonance" ;
-        ] ;
-    ] .
+    rdfs:seeAlso <Dexed.ttl> ;
+    rdfs:seeAlso <modgui.ttl> .
 
 <https://github.com/dcoredump/dexed.lv2/presets#E.PIANO_1>
     a pset:Preset ;
diff --git a/src/modgui.ttl b/src/modgui.ttl
new file mode 100644
index 0000000..9a4a039
--- /dev/null
+++ b/src/modgui.ttl
@@ -0,0 +1,33 @@
+@prefix modgui: <http://moddevices.com/ns/modgui#> .
+
+<https://github.com/dcoredump/dexed.lv2>
+    modgui:gui [
+        modgui:resourcesDirectory <modgui> ;
+        modgui:iconTemplate <modgui/icon-dexed.html> ;
+        modgui:stylesheet <modgui/stylesheet-dexed.css> ;
+        modgui:screenshot <modgui/screenshot-dexed.png> ;
+        modgui:thumbnail <modgui/thumbnail-dexed.png> ;
+        modgui:brand "dcoredump" ;
+        modgui:label "Dexed" ;
+        modgui:model "japanese" ;
+        modgui:panel "4-knobs" ;
+        modgui:color "black" ;
+        modgui:knob "racing" ;
+        modgui:port [
+            lv2:index 0 ;
+            lv2:symbol "output" ;
+            lv2:name "Output" ;
+        ] , [
+            lv2:index 1 ;
+            lv2:symbol "engine" ;
+            lv2:name "Engine" ;
+        ] , [
+            lv2:index 2 ;
+            lv2:symbol "cutoff" ;
+            lv2:name "Cutoff" ;
+        ] , [
+            lv2:index 3 ;
+            lv2:symbol "resonance" ;
+            lv2:name "Resonance" ;
+        ] ;
+    ] .