summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rdf/internals.ttl23
-rw-r--r--src/client/DeprecatedLoader.cpp9
-rw-r--r--src/engine/InternalPlugin.cpp8
-rw-r--r--src/engine/InternalPlugin.hpp1
-rw-r--r--src/engine/MidiControlNode.cpp4
-rw-r--r--src/engine/MidiNoteNode.cpp4
-rw-r--r--src/engine/MidiTriggerNode.cpp4
-rw-r--r--src/engine/TransportNode.cpp4
-rw-r--r--src/engine/events/NoteEvent.cpp10
-rw-r--r--src/gui/NodeMenu.cpp4
10 files changed, 37 insertions, 34 deletions
diff --git a/rdf/internals.ttl b/rdf/internals.ttl
index 8352af6f..f2c33b4e 100644
--- a/rdf/internals.ttl
+++ b/rdf/internals.ttl
@@ -25,28 +25,29 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
-@prefix : <http://drobilla.net/ns/ingen#> .
-@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#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema> .
+@prefix : <http://drobilla.net/ns/ingen-internals#> .
+@prefix ingen: <http://drobilla.net/ns/ingen#> .
+@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#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema> .
-:ControlPlugin a :Plugin ;
+:Controller a ingen:Plugin ;
rdfs:label "Controller" ;
rdfs:comment """
Receives events and outputs signals for some specific controller
(e.g. MIDI CC).
""" .
-:TriggerPlugin a :Plugin ;
+:Trigger a ingen:Plugin ;
rdfs:label "Trigger" ;
rdfs:comment """
Receives events and outputs a trigger signal when a specific note is received.
""" .
-:NotePlugin a :Plugin ;
+:Note a ingen:Plugin ;
rdfs:label "Note" ;
rdfs:comment """
Receives events and outputs signals for the individual properties of the
@@ -54,7 +55,7 @@ received notes. This plugin is special because it is internally aware of
Ingen's polyphony and controls voice allocation.
""" .
-:TransportPlugin a :Plugin ;
+:Transport a ingen:Plugin ;
rdfs:label "Transport" ;
rdfs:comment """
Listens to system transport information (when available) and outputs signals
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index 7dcd3853..82a5e578 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -38,6 +38,7 @@
#include "DeprecatedLoader.hpp"
#define NS_INGEN "http://drobilla.net/ns/ingen#"
+#define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
using namespace std;
@@ -500,13 +501,13 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
} else {
if (plugin_label == "note_in") {
- plugin_uri = NS_INGEN "note_node";
+ plugin_uri = NS_INTERNALS "Note";
} else if (plugin_label == "control_input") {
- plugin_uri = NS_INGEN "control_node";
+ plugin_uri = NS_INTERNALS "Controller";
} else if (plugin_label == "transport") {
- plugin_uri = NS_INGEN "transport_node";
+ plugin_uri = NS_INTERNALS "Transport";
} else if (plugin_label == "trigger_in") {
- plugin_uri = NS_INGEN "trigger_node";
+ plugin_uri = NS_INTERNALS "Trigger";
}
if (plugin_uri != "")
diff --git a/src/engine/InternalPlugin.cpp b/src/engine/InternalPlugin.cpp
index 2e869395..6d070037 100644
--- a/src/engine/InternalPlugin.cpp
+++ b/src/engine/InternalPlugin.cpp
@@ -38,13 +38,13 @@ InternalPlugin::instantiate(const string& name,
SampleCount srate = engine.audio_driver()->sample_rate();
SampleCount buffer_size = engine.audio_driver()->buffer_size();
- if (uri() == NS_INGEN "note_node") {
+ if (uri() == NS_INTERNALS "Note") {
return new MidiNoteNode(name, polyphonic, parent, srate, buffer_size);
- } else if (uri() == NS_INGEN "trigger_node") {
+ } else if (uri() == NS_INTERNALS "Trigger") {
return new MidiTriggerNode(name, polyphonic, parent, srate, buffer_size);
- } else if (uri() == NS_INGEN "control_node") {
+ } else if (uri() == NS_INTERNALS "Controller") {
return new MidiControlNode(name, polyphonic, parent, srate, buffer_size);
- } else if (uri() == NS_INGEN "transport_node") {
+ } else if (uri() == NS_INTERNALS "Transport") {
return new TransportNode(name, polyphonic, parent, srate, buffer_size);
} else {
return NULL;
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index 3b285a0a..e93f7b9b 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -35,6 +35,7 @@
#include "PluginImpl.hpp"
#define NS_INGEN "http://drobilla.net/ns/ingen#"
+#define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
namespace Ingen {
diff --git a/src/engine/MidiControlNode.cpp b/src/engine/MidiControlNode.cpp
index feae6799..e8237ba3 100644
--- a/src/engine/MidiControlNode.cpp
+++ b/src/engine/MidiControlNode.cpp
@@ -32,14 +32,14 @@
namespace Ingen {
+static InternalPlugin controller_plugin(NS_INTERNALS "Controller", "controller", "Controller");
MidiControlNode::MidiControlNode(const string& path,
bool polyphonic,
PatchImpl* parent,
SampleRate srate,
size_t buffer_size)
- : NodeBase(new InternalPlugin(NS_INGEN "control_node", "controller", "Controller")
- , path, false, parent, srate, buffer_size)
+ : NodeBase(&controller_plugin, path, false, parent, srate, buffer_size)
, _learning(false)
{
_ports = new Raul::Array<PortImpl*>(6);
diff --git a/src/engine/MidiNoteNode.cpp b/src/engine/MidiNoteNode.cpp
index 7918e1d2..53f0a0b0 100644
--- a/src/engine/MidiNoteNode.cpp
+++ b/src/engine/MidiNoteNode.cpp
@@ -35,10 +35,10 @@ using namespace std;
namespace Ingen {
+static InternalPlugin note_plugin(NS_INTERNALS "Note", "note", "Note");
MidiNoteNode::MidiNoteNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size)
- : NodeBase(new InternalPlugin(NS_INGEN "note_node", "note", "Note"),
- path, polyphonic, parent, srate, buffer_size)
+ : NodeBase(&note_plugin, path, polyphonic, parent, srate, buffer_size)
, _voices(new Raul::Array<Voice>(_polyphony))
, _prepared_voices(NULL)
, _sustain(false)
diff --git a/src/engine/MidiTriggerNode.cpp b/src/engine/MidiTriggerNode.cpp
index 0212154a..3cde19e7 100644
--- a/src/engine/MidiTriggerNode.cpp
+++ b/src/engine/MidiTriggerNode.cpp
@@ -30,10 +30,10 @@ using namespace std;
namespace Ingen {
+static InternalPlugin trigger_plugin(NS_INTERNALS "Trigger", "trigger", "Trigger");
MidiTriggerNode::MidiTriggerNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size)
- : NodeBase(new InternalPlugin(NS_INGEN "trigger_node", "trigger", "Trigger"),
- path, false, parent, srate, buffer_size)
+ : NodeBase(&trigger_plugin, path, false, parent, srate, buffer_size)
, _learning(false)
{
_ports = new Raul::Array<PortImpl*>(5);
diff --git a/src/engine/TransportNode.cpp b/src/engine/TransportNode.cpp
index 3fc14a43..746c6042 100644
--- a/src/engine/TransportNode.cpp
+++ b/src/engine/TransportNode.cpp
@@ -26,10 +26,10 @@
namespace Ingen {
+static InternalPlugin transport_plugin(NS_INTERNALS "Transport", "transport", "Transport");
TransportNode::TransportNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size)
-: NodeBase(new InternalPlugin(NS_INGEN "transport_node", "transport", "Transport Follower"),
- path, false, parent, srate, buffer_size)
+ : NodeBase(&transport_plugin, path, false, parent, srate, buffer_size)
{
#if 0
_num_ports = 10;
diff --git a/src/engine/events/NoteEvent.cpp b/src/engine/events/NoteEvent.cpp
index 58842ae6..bc44ae1f 100644
--- a/src/engine/events/NoteEvent.cpp
+++ b/src/engine/events/NoteEvent.cpp
@@ -72,14 +72,14 @@ NoteEvent::execute(ProcessContext& context)
if (_node != NULL && _node->plugin()->type() == Plugin::Internal) {
if (_on) {
- if (_node->plugin_impl()->uri() == NS_INGEN "note_node")
+ if (_node->plugin_impl()->uri() == NS_INTERNALS "Note")
((MidiNoteNode*)_node)->note_on(context, _note_num, _velocity, _time);
- else if (_node->plugin_impl()->uri() == NS_INGEN "trigger_node")
+ else if (_node->plugin_impl()->uri() == NS_INTERNALS "Trigger")
((MidiTriggerNode*)_node)->note_on(context, _note_num, _velocity, _time);
} else {
- if (_node->plugin_impl()->uri() == NS_INGEN "note_node")
+ if (_node->plugin_impl()->uri() == NS_INTERNALS "Note")
((MidiNoteNode*)_node)->note_off(context, _note_num, _time);
- else if (_node->plugin_impl()->uri() == NS_INGEN "trigger_node")
+ else if (_node->plugin_impl()->uri() == NS_INTERNALS "Trigger")
((MidiTriggerNode*)_node)->note_off(context, _note_num, _time);
}
}
@@ -93,7 +93,7 @@ NoteEvent::post_process()
if (_node)
_responder->respond_ok();
else
- _responder->respond_error("Did not find node for note_on");
+ _responder->respond_error("Did not find node for note on event");
}
}
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index e4273330..79067cb9 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -90,8 +90,8 @@ NodeMenu::init(SharedPtr<NodeModel> node)
else
_randomize_menuitem->hide();
- if (plugin->uri() == "http://drobilla.net/ns/ingen#control_node"
- || plugin->uri() == "http://drobilla.net/ns/ingen#trigger_node")
+ if (plugin->uri() == "http://drobilla.net/ns/ingen-internals#Controller"
+ || plugin->uri() == "http://drobilla.net/ns/ingen-internals#Trigger")
_learn_menuitem->show();
else
_learn_menuitem->hide();
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-25 12:15:43 +0000