summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ingen/shared/URIs.hpp4
-rw-r--r--ingen.lv2/mono_effect.ttl17
-rw-r--r--ingen.lv2/mono_synth.ttl13
-rw-r--r--ingen.lv2/stereo_effect.ttl25
-rw-r--r--ingen.lv2/stereo_synth.ttl17
-rw-r--r--patches/decimated_delay.ingen.ttl25
-rw-r--r--patches/dist_oct.ingen.ttl57
-rw-r--r--patches/saw_lp.ingen.ttl57
-rw-r--r--src/gui/LoadPatchWindow.cpp4
-rw-r--r--src/gui/LoadPluginWindow.cpp4
-rw-r--r--src/gui/NodeModule.cpp16
-rw-r--r--src/gui/PatchCanvas.cpp8
-rw-r--r--src/gui/PatchPortModule.cpp16
-rw-r--r--src/gui/SubpatchModule.cpp12
-rw-r--r--src/http/HTTPClientSender.cpp3
-rw-r--r--src/server/Engine.cpp8
-rw-r--r--src/shared/URIs.cpp5
-rw-r--r--src/shared/World.cpp1
18 files changed, 141 insertions, 151 deletions
diff --git a/include/ingen/shared/URIs.hpp b/include/ingen/shared/URIs.hpp
index ba68f9eb..39faa83b 100644
--- a/include/ingen/shared/URIs.hpp
+++ b/include/ingen/shared/URIs.hpp
@@ -68,8 +68,8 @@ public:
const Quark ingen_sampleRate;
const Quark ingen_selected;
const Quark ingen_value;
- const Quark ingenui_canvas_x;
- const Quark ingenui_canvas_y;
+ const Quark ingen_canvas_x;
+ const Quark ingen_canvas_y;
const Quark lv2_AudioPort;
const Quark lv2_ControlPort;
const Quark lv2_InputPort;
diff --git a/ingen.lv2/mono_effect.ttl b/ingen.lv2/mono_effect.ttl
index bef63789..e5d6188b 100644
--- a/ingen.lv2/mono_effect.ttl
+++ b/ingen.lv2/mono_effect.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .
@prefix ctx: <http://lv2plug.in/ns/ext/contexts#> .
@@ -30,8 +29,8 @@
<audio_in_1>
ingen:polyphonic false ;
- ingenui:canvas-x 12.50000000 ;
- ingenui:canvas-y 95.00000000 ;
+ ingen:canvas-x 12.50000000 ;
+ ingen:canvas-y 95.00000000 ;
lv2:index 2 ;
lv2:name "Audio In 1" ;
lv2:symbol "audio_in_1" ;
@@ -40,8 +39,8 @@
<audio_out_1>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 3 ;
lv2:name "Audio Out 1" ;
lv2:symbol "audio_out_1" ;
@@ -50,8 +49,8 @@
<control_in>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 180.00000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 180.00000000 ;
lv2:index 0 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
@@ -61,8 +60,8 @@
<control_out>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 137.50000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 137.50000000 ;
lv2:index 1 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
diff --git a/ingen.lv2/mono_synth.ttl b/ingen.lv2/mono_synth.ttl
index 0ad68611..de198031 100644
--- a/ingen.lv2/mono_synth.ttl
+++ b/ingen.lv2/mono_synth.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .
@prefix ctx: <http://lv2plug.in/ns/ext/contexts#> .
@@ -25,8 +24,8 @@
<audio_out_1>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 3 ;
lv2:name "Audio Out 1" ;
lv2:symbol "audio_out_1" ;
@@ -35,8 +34,8 @@
<control_in>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 180.00000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 180.00000000 ;
lv2:index 0 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
@@ -46,8 +45,8 @@
<control_out>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 137.50000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 137.50000000 ;
lv2:index 1 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
diff --git a/ingen.lv2/stereo_effect.ttl b/ingen.lv2/stereo_effect.ttl
index bc73483f..64138c54 100644
--- a/ingen.lv2/stereo_effect.ttl
+++ b/ingen.lv2/stereo_effect.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .
@prefix ctx: <http://lv2plug.in/ns/ext/contexts#> .
@@ -35,8 +34,8 @@
<audio_in_1>
ingen:polyphonic false ;
- ingenui:canvas-x 12.50000000 ;
- ingenui:canvas-y 95.00000000 ;
+ ingen:canvas-x 12.50000000 ;
+ ingen:canvas-y 95.00000000 ;
lv2:index 2 ;
lv2:name "Audio In 1" ;
lv2:symbol "audio_in_1" ;
@@ -45,8 +44,8 @@
<audio_in_2>
ingen:polyphonic false ;
- ingenui:canvas-x 12.50000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 12.50000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 4 ;
lv2:name "Audio In 2" ;
lv2:symbol "audio_in_2" ;
@@ -55,8 +54,8 @@
<audio_out_1>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 3 ;
lv2:name "Audio Out 1" ;
lv2:symbol "audio_out_1" ;
@@ -65,8 +64,8 @@
<audio_out_2>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 5 ;
lv2:name "Audio Out 2" ;
lv2:symbol "audio_out_2" ;
@@ -75,8 +74,8 @@
<control_in>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 180.00000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 180.00000000 ;
lv2:index 0 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
@@ -86,8 +85,8 @@
<control_out>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 137.50000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 137.50000000 ;
lv2:index 1 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
diff --git a/ingen.lv2/stereo_synth.ttl b/ingen.lv2/stereo_synth.ttl
index 1ebac299..c8e5e233 100644
--- a/ingen.lv2/stereo_synth.ttl
+++ b/ingen.lv2/stereo_synth.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .
@prefix ctx: <http://lv2plug.in/ns/ext/contexts#> .
@@ -26,8 +25,8 @@
<audio_out_1>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 3 ;
lv2:name "Audio Out 1" ;
lv2:symbol "audio_out_1" ;
@@ -36,8 +35,8 @@
<audio_out_2>
ingen:polyphonic false ;
- ingenui:canvas-x 154.25000000 ;
- ingenui:canvas-y 52.50000000 ;
+ ingen:canvas-x 154.25000000 ;
+ ingen:canvas-y 52.50000000 ;
lv2:index 5 ;
lv2:name "Audio Out 2" ;
lv2:symbol "audio_out_2" ;
@@ -46,8 +45,8 @@
<control_in>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 180.00000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 180.00000000 ;
lv2:index 0 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
@@ -57,8 +56,8 @@
<control_out>
ingen:polyphonic false ;
- ingenui:canvas-x 23.50000000 ;
- ingenui:canvas-y 137.50000000 ;
+ ingen:canvas-x 23.50000000 ;
+ ingen:canvas-y 137.50000000 ;
lv2:index 1 ;
lv2:name "Control" ;
lv2:portProperty lv2:connectionOptional ;
diff --git a/patches/decimated_delay.ingen.ttl b/patches/decimated_delay.ingen.ttl
index ade5cf54..41d84c79 100644
--- a/patches/decimated_delay.ingen.ttl
+++ b/patches/decimated_delay.ingen.ttl
@@ -1,7 +1,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenuity: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
<>
@@ -74,8 +73,8 @@
ingen:dataType "ingen:audio";
ingen:connectedTo _:n21, _:n19
], _:n13;
- ingenuity:canvas-x 1520.5;
- ingenuity:canvas-y 1056.6
+ ingen:canvas-x 1520.5;
+ ingen:canvas-y 1056.6
], [
a ingen:Node;
ingen:symbol "SmoothDecimator";
@@ -96,22 +95,22 @@
ingen:dataType "ingen:audio";
ingen:connectedTo _:n13
], _:n18;
- ingenuity:canvas-x 1644.5;
- ingenuity:canvas-y 1124.1
+ ingen:canvas-x 1644.5;
+ ingen:canvas-y 1124.1
];
ingen:port _:n19, [
a ingen:OutputPort;
ingen:symbol "audio_output_1";
ingen:dataType "ingen:audio";
- ingenuity:canvas-x 1804.5;
- ingenuity:canvas-y 1128.1;
+ ingen:canvas-x 1804.5;
+ ingen:canvas-y 1128.1;
ingen:connectedTo _:n18
], _:n21, [
a ingen:OutputPort;
ingen:symbol "audio_output_2";
ingen:dataType "ingen:audio";
- ingenuity:canvas-x 1804.5;
- ingenuity:canvas-y 1180.6;
+ ingen:canvas-x 1804.5;
+ ingen:canvas-y 1180.6;
ingen:connectedTo _:n18
] .
@@ -129,13 +128,13 @@ _:n19
a ingen:InputPort;
ingen:symbol "audio_input_1";
ingen:dataType "ingen:audio";
- ingenuity:canvas-x 1384.5;
- ingenuity:canvas-y 1128.1 .
+ ingen:canvas-x 1384.5;
+ ingen:canvas-y 1128.1 .
_:n21
a ingen:InputPort;
ingen:symbol "audio_input_2";
ingen:dataType "ingen:audio";
- ingenuity:canvas-x 1384.5;
- ingenuity:canvas-y 1180.6 .
+ ingen:canvas-x 1384.5;
+ ingen:canvas-y 1180.6 .
diff --git a/patches/dist_oct.ingen.ttl b/patches/dist_oct.ingen.ttl
index 2b667df9..793fe9ca 100644
--- a/patches/dist_oct.ingen.ttl
+++ b/patches/dist_oct.ingen.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenuity: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2_midi: <http://lv2plug.in/ns/ext/midi> .
@prefix lv2var: <http://lv2plug.in/ns/ext/instance-var#> .
@@ -14,10 +13,10 @@
ingen:polyphonic true ;
ingen:port <DubDelay/delay>, <DubDelay/f_x_mix>, <DubDelay/fb_tone>, <DubDelay/feedback>, <DubDelay/in1>, <DubDelay/in2>, <DubDelay/lfo_dep_>, <DubDelay/lfo_rate>, <DubDelay/out1>, <DubDelay/out2>, <DubDelay/output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1922.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1000.75
] ;
lv2:symbol "DubDelay" ;
@@ -90,10 +89,10 @@
ingen:polyphonic true ;
ingen:port <adsr_g_t/Attack_Time>, <adsr_g_t/Decay_Time>, <adsr_g_t/Envelope_Out>, <adsr_g_t/Gate>, <adsr_g_t/Release_Time>, <adsr_g_t/Sustain_Level>, <adsr_g_t/Trigger> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1427.25
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1034.75
] ;
lv2:symbol "adsr_g_t" ;
@@ -183,10 +182,10 @@
ingen:polyphonic true ;
ingen:port <amp/gain>, <amp/input>, <amp/output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1820.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1068.75
] ;
lv2:symbol "amp" ;
@@ -210,10 +209,10 @@
<audio_output_1>
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 2037.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1066.5
] ;
lv2:index 1 ;
@@ -222,10 +221,10 @@
<audio_output_2>
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 2037.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1121.5
] ;
lv2:index 2 ;
@@ -237,10 +236,10 @@
ingen:polyphonic true ;
ingen:port <detune_0/First_Input>, <detune_0/Second_Input>, <detune_0/Summed_Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1418.25
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1188.75
] ;
lv2:symbol "detune_0" ;
@@ -327,10 +326,10 @@
ingen:polyphony 1 ;
ingen:port <audio_output_1>, <audio_output_2>, <midi_input_1> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1456.25
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1129.125
] ;
a ingen:Patch .
@@ -340,10 +339,10 @@
ingen:polyphonic true ;
ingen:port <foverdrive/drive>, <foverdrive/input>, <foverdrive/output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1704.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1021.25
] ;
lv2:symbol "foverdrive" ;
@@ -367,10 +366,10 @@
<midi_input_1>
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1145.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1094.0
] ;
lv2:index 1 ;
@@ -382,10 +381,10 @@
ingen:polyphonic true ;
ingen:port <note/frequency>, <note/gate>, <note/input>, <note/trigger>, <note/velocity> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1298.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1051.75
] ;
lv2:symbol "note" ;
@@ -436,10 +435,10 @@
ingen:polyphonic true ;
ingen:port <product_iaic_oa/First_Input>, <product_iaic_oa/Product_Output>, <product_iaic_oa/Second_Input> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1420.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1276.25
] ;
lv2:symbol "product_iaic_oa" ;
@@ -473,10 +472,10 @@
ingen:polyphonic true ;
ingen:port <sine_faaa/Amplitude>, <sine_faaa/Frequency>, <sine_faaa/Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1579.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1021.25
] ;
lv2:symbol "sine_faaa" ;
@@ -502,10 +501,10 @@
ingen:polyphonic true ;
ingen:port <sine_faaa_0/Amplitude>, <sine_faaa_0/Frequency>, <sine_faaa_0/Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1578.25
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1116.25
] ;
lv2:symbol "sine_faaa_0" ;
@@ -531,10 +530,10 @@
ingen:polyphonic true ;
ingen:port <valveRect/dist_p>, <valveRect/input>, <valveRect/output>, <valveRect/sag> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1705.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1107.75
] ;
lv2:symbol "valveRect" ;
diff --git a/patches/saw_lp.ingen.ttl b/patches/saw_lp.ingen.ttl
index 97d79d19..e710d7d3 100644
--- a/patches/saw_lp.ingen.ttl
+++ b/patches/saw_lp.ingen.ttl
@@ -2,7 +2,6 @@
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix ingen: <http://drobilla.net/ns/ingen#> .
-@prefix ingenuity: <http://drobilla.net/ns/ingenuity#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix lv2_midi: <http://lv2plug.in/ns/ext/midi> .
@prefix lv2var: <http://lv2plug.in/ns/ext/instance-var#> .
@@ -14,10 +13,10 @@
ingen:polyphonic true ;
ingen:port <amp/gain>, <amp/input>, <amp/output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1913.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1203.75
] ;
lv2:symbol "amp" ;
@@ -44,10 +43,10 @@
ingen:polyphonic true ;
ingen:port <amp_env/Attack_Time>, <amp_env/Decay_Time>, <amp_env/Delay_Time>, <amp_env/Envelope_Out>, <amp_env/Gate>, <amp_env/Hold_Time>, <amp_env/Release_Time>, <amp_env/Sustain_Level>, <amp_env/Trigger> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1451.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 867.75
] ;
lv2:symbol "amp_env" ;
@@ -166,10 +165,10 @@
<audio_output_1>
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 2013.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1229.0
] ;
lv2:index 0 ;
@@ -185,10 +184,10 @@
rdf:predicate ingen:minimum ;
rdf:value 100.0
], [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1465.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1420.25
] ;
lv2:index 1 ;
@@ -200,10 +199,10 @@
ingen:polyphonic true ;
ingen:port <detune/First_Input>, <detune/Second_Input>, <detune/Summed_Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1442.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1053.75
] ;
lv2:symbol "detune" ;
@@ -237,10 +236,10 @@
ingen:polyphonic true ;
ingen:port <detune_0/First_Input>, <detune_0/Second_Input>, <detune_0/Summed_Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1442.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1141.25
] ;
lv2:symbol "detune_0" ;
@@ -339,10 +338,10 @@
ingen:polyphonic true ;
ingen:port <filter_env/Attack_Time>, <filter_env/Decay_Time>, <filter_env/Delay_Time>, <filter_env/Envelope_Out>, <filter_env/Gate>, <filter_env/Hold_Time>, <filter_env/Release_Time>, <filter_env/Sustain_Level>, <filter_env/Trigger> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1451.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1225.25
] ;
lv2:symbol "filter_env" ;
@@ -464,10 +463,10 @@
ingen:polyphonic true ;
ingen:port <lp4pole_faraia_oa/Cutoff_Frequency>, <lp4pole_faraia_oa/Input>, <lp4pole_faraia_oa/Output>, <lp4pole_faraia_oa/Resonance> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1747.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1195.25
] ;
lv2:symbol "lp4pole_faraia_oa" ;
@@ -495,10 +494,10 @@
<midi_input_1>
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1168.75
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1079.0
] ;
lv2:index 2 ;
@@ -510,10 +509,10 @@
ingen:polyphonic true ;
ingen:port <note/frequency>, <note/gate>, <note/input>, <note/trigger>, <note/velocity> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1322.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1036.75
] ;
lv2:symbol "note" ;
@@ -564,10 +563,10 @@
ingen:polyphonic true ;
ingen:port <range_trans_cr/Input>, <range_trans_cr/Input_Max>, <range_trans_cr/Input_Min>, <range_trans_cr/Output>, <range_trans_cr/Output_Max>, <range_trans_cr/Output_Min> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1602.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1239.5
] ;
lv2:symbol "range_trans_cr" ;
@@ -653,10 +652,10 @@
rdf:predicate ingen:maximum ;
rdf:value 4.0
], [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1602.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1385.25
] ;
lv2:index 3 ;
@@ -668,10 +667,10 @@
ingen:polyphonic true ;
ingen:port <sine_faaa/Amplitude>, <sine_faaa/Frequency>, <sine_faaa/Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1613.5
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 918.75
] ;
lv2:symbol "sine_faaa" ;
@@ -697,10 +696,10 @@
ingen:polyphonic true ;
ingen:port <sine_faaa_0/Amplitude>, <sine_faaa_0/Frequency>, <sine_faaa_0/Output> ;
lv2var:variable [
- rdf:predicate ingenuity:canvas-x ;
+ rdf:predicate ingen:canvas-x ;
rdf:value 1612.0
], [
- rdf:predicate ingenuity:canvas-y ;
+ rdf:predicate ingen:canvas-y ;
rdf:value 1141.25
] ;
lv2:symbol "sine_faaa_0" ;
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 8c121b5e..33094bbd 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -176,9 +176,9 @@ LoadPatchWindow::ok_clicked()
std::list<Glib::ustring> uri_list = get_uris();
for (std::list<Glib::ustring>::iterator i = uri_list.begin(); i != uri_list.end(); ++i) {
// Cascade
- Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second;
+ Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
x = Atom(x.get_float() + 20.0f);
- Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second;
+ Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
y = Atom(y.get_float() + 20.0f);
Raul::Symbol symbol(symbol_from_filename(*i));
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index c89b4c46..238cf7cb 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -354,9 +354,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
}
// Cascade next node
- Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second;
+ Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
x = Atom(x.get_float() + 20.0f);
- Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second;
+ Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
y = Atom(y.get_float() + 20.0f);
}
}
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 5a8e30ad..0767a175 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -365,16 +365,16 @@ NodeModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x, x));
- add.insert(make_pair(uris.ingenui_canvas_y, y));
+ add.insert(make_pair(uris.ingen_canvas_x, x));
+ add.insert(make_pair(uris.ingen_canvas_y, y));
app().engine()->delta(_node->path(), remove, add);
}
}
@@ -385,9 +385,9 @@ NodeModule::property_changed(const URI& key, const Atom& value)
const Shared::URIs& uris = app().uris();
switch (value.type()) {
case Atom::FLOAT:
- if (key == uris.ingenui_canvas_x) {
+ if (key == uris.ingen_canvas_x) {
move_to(value.get_float(), property_y());
- } else if (key == uris.ingenui_canvas_y) {
+ } else if (key == uris.ingen_canvas_y) {
move_to(property_x(), value.get_float());
}
break;
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 299336cf..71facb23 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -717,11 +717,11 @@ PatchCanvas::paste()
GraphObject::Properties& props = i->second->properties();
- GraphObject::Properties::iterator x = props.find(uris.ingenui_canvas_x);
+ GraphObject::Properties::iterator x = props.find(uris.ingen_canvas_x);
if (x != i->second->properties().end())
x->second = x->second.get_float() + (20.0f * _paste_count);
- GraphObject::Properties::iterator y = props.find(uris.ingenui_canvas_y);
+ GraphObject::Properties::iterator y = props.find(uris.ingen_canvas_y);
if (y != i->second->properties().end())
y->second = y->second.get_float() + (20.0f * _paste_count);
@@ -821,9 +821,9 @@ PatchCanvas::get_initial_data(Resource::Graph ctx)
{
GraphObject::Properties result;
const URIs& uris = _app.uris();
- result.insert(make_pair(uris.ingenui_canvas_x,
+ result.insert(make_pair(uris.ingen_canvas_x,
Resource::Property((float)_last_click_x, ctx)));
- result.insert(make_pair(uris.ingenui_canvas_y,
+ result.insert(make_pair(uris.ingen_canvas_y,
Resource::Property((float)_last_click_y, ctx)));
return result;
}
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 3a00c344..51669f6d 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -91,17 +91,17 @@ PatchPortModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _model->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _model->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _model->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _model->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x,
+ add.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(x, Resource::INTERNAL)));
- add.insert(make_pair(uris.ingenui_canvas_y,
+ add.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(y, Resource::INTERNAL)));
app().engine()->delta(_model->path(), remove, add);
}
@@ -131,9 +131,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
const URIs& uris = app().uris();
switch (value.type()) {
case Atom::FLOAT:
- if (key == uris.ingenui_canvas_x) {
+ if (key == uris.ingen_canvas_x) {
move_to(value.get_float(), property_y());
- } else if (key == uris.ingenui_canvas_y) {
+ } else if (key == uris.ingen_canvas_y) {
move_to(property_x(), value.get_float());
}
break;
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 72bcd8af..4dbb56a5 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -68,17 +68,17 @@ SubpatchModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x,
+ add.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(x, Resource::EXTERNAL)));
- add.insert(make_pair(uris.ingenui_canvas_y,
+ add.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(y, Resource::EXTERNAL)));
app().engine()->delta(_node->path(), remove, add);
}
diff --git a/src/http/HTTPClientSender.cpp b/src/http/HTTPClientSender.cpp
index 564954ae..979d1e64 100644
--- a/src/http/HTTPClientSender.cpp
+++ b/src/http/HTTPClientSender.cpp
@@ -118,8 +118,7 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v
Sord::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world(), value);
const string msg = string(
"@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n"
- "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n"
- "@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .\n").append(
+ "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n").append(
subject.str()).append("> ingen:property [\n"
"rdf:predicate ").append(key.str()).append(" ;\n"
"rdf:value ").append(node.to_string()).append("\n] .\n");
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index bf0ef61b..2bd96a47 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -180,9 +180,9 @@ Engine::activate()
in_properties.insert(make_pair(uris.lv2_index, 0));
in_properties.insert(make_pair(uris.lv2_portProperty,
uris.lv2_connectionOptional));
- in_properties.insert(make_pair(uris.ingenui_canvas_x,
+ in_properties.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(32.0f, Resource::EXTERNAL)));
- in_properties.insert(make_pair(uris.ingenui_canvas_y,
+ in_properties.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(32.0f, Resource::EXTERNAL)));
execute_and_delete_event(
@@ -196,9 +196,9 @@ Engine::activate()
out_properties.insert(make_pair(uris.lv2_index, 1));
in_properties.insert(make_pair(uris.lv2_portProperty,
uris.lv2_connectionOptional));
- out_properties.insert(make_pair(uris.ingenui_canvas_x,
+ out_properties.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(128.0f, Resource::EXTERNAL)));
- out_properties.insert(make_pair(uris.ingenui_canvas_y,
+ out_properties.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(32.0f, Resource::EXTERNAL)));
execute_and_delete_event(
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index c0753d5d..869aa26e 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -48,7 +48,6 @@ URIs::Quark::c_str() const
#define NS_CTX "http://lv2plug.in/ns/ext/contexts#"
#define NS_INGEN "http://drobilla.net/ns/ingen#"
-#define NS_INGENUI "http://drobilla.net/ns/ingenuity#"
#define NS_LV2 "http://lv2plug.in/ns/lv2core#"
#define NS_MIDI "http://drobilla.net/ns/ext/midi#"
#define NS_MIDI "http://drobilla.net/ns/ext/midi#"
@@ -86,8 +85,8 @@ URIs::URIs()
, ingen_sampleRate (NS_INGEN "sampleRate")
, ingen_selected (NS_INGEN "selected")
, ingen_value (NS_INGEN "value")
- , ingenui_canvas_x (NS_INGENUI "canvas-x")
- , ingenui_canvas_y (NS_INGENUI "canvas-y")
+ , ingen_canvas_x (NS_INGEN "canvas-x")
+ , ingen_canvas_y (NS_INGEN "canvas-y")
, lv2_AudioPort (NS_LV2 "AudioPort")
, lv2_ControlPort (NS_LV2 "ControlPort")
, lv2_InputPort (NS_LV2 "InputPort")
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index e66f04a5..1e3dc46f 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -116,7 +116,6 @@ public:
rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/ext/contexts#");
rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#");
rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#");
- rdf_world->add_prefix("ingenui", "http://drobilla.net/ns/ingenuity#");
rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#");
rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#");
rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#");
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-25 10:16:19 +0000