Stricter symbol construction and conversion.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4670 a436a847-0d15-0410-975c-d299462d15a1

8 files changed, 71 insertions, 71 deletions

diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index a088488c..09eafa87 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -42,24 +42,24 @@ InternalPlugin* ControllerNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Controller", "controller");
 }
 
-ControllerNode::ControllerNode(InternalPlugin* plugin,
-                               BufferFactory&  bufs,
-                               const string&   path,
-                               bool            polyphonic,
-                               PatchImpl*      parent,
-                               SampleRate      srate)
-	: NodeImpl(plugin, path, false, parent, srate)
+ControllerNode::ControllerNode(InternalPlugin*     plugin,
+                               BufferFactory&      bufs,
+                               const Raul::Symbol& symbol,
+                               bool                polyphonic,
+                               PatchImpl*          parent,
+                               SampleRate          srate)
+	: NodeImpl(plugin, symbol, false, parent, srate)
 	, _learning(false)
 {
 	const Ingen::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(6);
 
-	_midi_in_port = new InputPort(bufs, this, "input", 0, 1,
+	_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
 	                              PortType::ATOM, uris.atom_Sequence, Raul::Atom());
 	_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
 	_ports->at(0) = _midi_in_port;
 
-	_param_port = new InputPort(bufs, this, "controller", 1, 1,
+	_param_port = new InputPort(bufs, this, Raul::Symbol("controller"), 1, 1,
 	                            PortType::CONTROL, 0, bufs.forge().make(0.0f));
 	_param_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f));
 	_param_port->set_property(uris.lv2_maximum, bufs.forge().make(127.0f));
@@ -67,23 +67,23 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
 	_param_port->set_property(uris.lv2_name, bufs.forge().alloc("Controller"));
 	_ports->at(1) = _param_port;
 
-	_log_port = new InputPort(bufs, this, "logarithmic", 2, 1,
+	_log_port = new InputPort(bufs, this, Raul::Symbol("logarithmic"), 2, 1,
 	                          PortType::CONTROL, 0, bufs.forge().make(0.0f));
 	_log_port->set_property(uris.lv2_portProperty, uris.lv2_toggled);
 	_log_port->set_property(uris.lv2_name, bufs.forge().alloc("Logarithmic"));
 	_ports->at(2) = _log_port;
 
-	_min_port = new InputPort(bufs, this, "minimum", 3, 1,
+	_min_port = new InputPort(bufs, this, Raul::Symbol("minimum"), 3, 1,
 	                          PortType::CONTROL, 0, bufs.forge().make(0.0f));
 	_min_port->set_property(uris.lv2_name, bufs.forge().alloc("Minimum"));
 	_ports->at(3) = _min_port;
 
-	_max_port = new InputPort(bufs, this, "maximum", 4, 1,
+	_max_port = new InputPort(bufs, this, Raul::Symbol("maximum"), 4, 1,
 	                          PortType::CONTROL, 0, bufs.forge().make(1.0f));
 	_max_port->set_property(uris.lv2_name, bufs.forge().alloc("Maximum"));
 	_ports->at(4) = _max_port;
 
-	_audio_port = new OutputPort(bufs, this, "output", 5, 1,
+	_audio_port = new OutputPort(bufs, this, Raul::Symbol("output"), 5, 1,
 	                             PortType::CV, 0, bufs.forge().make(0.0f));
 	_audio_port->set_property(uris.lv2_name, bufs.forge().alloc("Output"));
 	_ports->at(5) = _audio_port;
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index e4717247..31e5f306 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -39,12 +39,12 @@ namespace Internals {
 class ControllerNode : public NodeImpl
 {
 public:
-	ControllerNode(InternalPlugin*    plugin,
-	               BufferFactory&     bufs,
-	               const std::string& path,
-	               bool               polyphonic,
-	               PatchImpl*         parent,
-	               SampleRate         srate);
+	ControllerNode(InternalPlugin*     plugin,
+	               BufferFactory&      bufs,
+	               const Raul::Symbol& symbol,
+	               bool                polyphonic,
+	               PatchImpl*          parent,
+	               SampleRate          srate);
 
 	void process(ProcessContext& context);
 
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 01a48683..f687a04e 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -53,13 +53,13 @@ InternalPlugin* DelayNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Delay", "delay");
 }
 
-DelayNode::DelayNode(InternalPlugin*    plugin,
-                     BufferFactory&     bufs,
-                     const std::string& path,
-                     bool               polyphonic,
-                     PatchImpl*         parent,
-                     SampleRate         srate)
-	: NodeImpl(plugin, path, polyphonic, parent, srate)
+DelayNode::DelayNode(InternalPlugin*     plugin,
+                     BufferFactory&      bufs,
+                     const Raul::Symbol& symbol,
+                     bool                polyphonic,
+                     PatchImpl*          parent,
+                     SampleRate          srate)
+	: NodeImpl(plugin, symbol, polyphonic, parent, srate)
 	, _buffer(0)
 	, _buffer_length(0)
 	, _buffer_mask(0)
@@ -72,7 +72,7 @@ DelayNode::DelayNode(InternalPlugin*    plugin,
 	_last_delay_time = default_delay;
 	_delay_samples = default_delay;
 
-	_delay_port = new InputPort(bufs, this, "delay", 1, _polyphony,
+	_delay_port = new InputPort(bufs, this, Raul::Symbol("delay"), 1, _polyphony,
 	                            PortType::CONTROL, 0, bufs.forge().make(default_delay));
 	_delay_port->set_property(uris.lv2_name, bufs.forge().alloc("Delay"));
 	_delay_port->set_property(uris.lv2_default, bufs.forge().make(default_delay));
@@ -80,12 +80,12 @@ DelayNode::DelayNode(InternalPlugin*    plugin,
 	_delay_port->set_property(uris.lv2_maximum, bufs.forge().make(MAX_DELAY_SECONDS));
 	_ports->at(0) = _delay_port;
 
-	_in_port = new InputPort(bufs, this, "in", 0, 1,
+	_in_port = new InputPort(bufs, this, Raul::Symbol("in"), 0, 1,
 	                         PortType::AUDIO, 0, bufs.forge().make(0.0f));
 	_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
 	_ports->at(1) = _in_port;
 
-	_out_port = new OutputPort(bufs, this, "out", 0, 1,
+	_out_port = new OutputPort(bufs, this, Raul::Symbol("out"), 0, 1,
 	                           PortType::AUDIO, 0, bufs.forge().make(0.0f));
 	_out_port->set_property(uris.lv2_name,
 	                        bufs.forge().alloc("Output"));
diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp
index 4609eaa0..047fa41e 100644
--- a/src/server/internals/Delay.hpp
+++ b/src/server/internals/Delay.hpp
@@ -35,12 +35,12 @@ namespace Internals {
 class DelayNode : public NodeImpl
 {
 public:
-	DelayNode(InternalPlugin*    plugin,
-	          BufferFactory&     bufs,
-	          const std::string& path,
-	          bool               polyphonic,
-	          PatchImpl*         parent,
-	          SampleRate         srate);
+	DelayNode(InternalPlugin*     plugin,
+	          BufferFactory&      bufs,
+	          const Raul::Symbol& symbol,
+	          bool                polyphonic,
+	          PatchImpl*          parent,
+	          SampleRate          srate);
 
 	~DelayNode();
 
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 3970169b..d8993659 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -49,13 +49,13 @@ InternalPlugin* NoteNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Note", "note");
 }
 
-NoteNode::NoteNode(InternalPlugin*    plugin,
-                   BufferFactory&     bufs,
-                   const std::string& path,
-                   bool               polyphonic,
-                   PatchImpl*         parent,
-                   SampleRate         srate)
-	: NodeImpl(plugin, path, polyphonic, parent, srate)
+NoteNode::NoteNode(InternalPlugin*     plugin,
+                   BufferFactory&      bufs,
+                   const Raul::Symbol& symbol,
+                   bool                polyphonic,
+                   PatchImpl*          parent,
+                   SampleRate          srate)
+	: NodeImpl(plugin, symbol, polyphonic, parent, srate)
 	, _voices(new Raul::Array<Voice>(_polyphony))
 	, _prepared_voices(NULL)
 	, _sustain(false)
@@ -63,32 +63,32 @@ NoteNode::NoteNode(InternalPlugin*    plugin,
 	const Ingen::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(5);
 
-	_midi_in_port = new InputPort(bufs, this, "input", 0, 1,
+	_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
 	                              PortType::ATOM, uris.atom_Sequence, Raul::Atom());
 	_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
 	_ports->at(0) = _midi_in_port;
 
-	_freq_port = new OutputPort(bufs, this, "frequency", 1, _polyphony,
+	_freq_port = new OutputPort(bufs, this, Raul::Symbol("frequency"), 1, _polyphony,
 	                            PortType::CV, 0, bufs.forge().make(440.0f));
 	_freq_port->set_property(uris.lv2_name, bufs.forge().alloc("Frequency"));
 	_freq_port->set_property(uris.lv2_minimum, bufs.forge().make(16.0f));
 	_freq_port->set_property(uris.lv2_maximum, bufs.forge().make(25088.0f));
 	_ports->at(1) = _freq_port;
 
-	_vel_port = new OutputPort(bufs, this, "velocity", 2, _polyphony,
+	_vel_port = new OutputPort(bufs, this, Raul::Symbol("velocity"), 2, _polyphony,
 	                           PortType::CV, 0, bufs.forge().make(0.0f));
 	_vel_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f));
 	_vel_port->set_property(uris.lv2_maximum, bufs.forge().make(1.0f));
 	_vel_port->set_property(uris.lv2_name, bufs.forge().alloc("Velocity"));
 	_ports->at(2) = _vel_port;
 
-	_gate_port = new OutputPort(bufs, this, "gate", 3, _polyphony,
+	_gate_port = new OutputPort(bufs, this, Raul::Symbol("gate"), 3, _polyphony,
 	                            PortType::CV, 0, bufs.forge().make(0.0f));
 	_gate_port->set_property(uris.lv2_portProperty, uris.lv2_toggled);
 	_gate_port->set_property(uris.lv2_name, bufs.forge().alloc("Gate"));
 	_ports->at(3) = _gate_port;
 
-	_trig_port = new OutputPort(bufs, this, "trigger", 4, _polyphony,
+	_trig_port = new OutputPort(bufs, this, Raul::Symbol("trigger"), 4, _polyphony,
 	                            PortType::CV, 0, bufs.forge().make(0.0f));
 	_trig_port->set_property(uris.lv2_portProperty, uris.lv2_toggled);
 	_trig_port->set_property(uris.lv2_name, bufs.forge().alloc("Trigger"));
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index ed7fd6b0..9cf07a05 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -39,12 +39,12 @@ namespace Internals {
 class NoteNode : public NodeImpl
 {
 public:
-	NoteNode(InternalPlugin*    plugin,
-	         BufferFactory&     bufs,
-	         const std::string& path,
-	         bool               polyphonic,
-	         PatchImpl*         parent,
-	         SampleRate         srate);
+	NoteNode(InternalPlugin*     plugin,
+	         BufferFactory&      bufs,
+	         const Raul::Symbol& symbol,
+	         bool                polyphonic,
+	         PatchImpl*          parent,
+	         SampleRate          srate);
 
 	~NoteNode();
 
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 0eb0c9f1..ca37bd59 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -44,24 +44,24 @@ InternalPlugin* TriggerNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(uris, NS_INTERNALS "Trigger", "trigger");
 }
 
-TriggerNode::TriggerNode(InternalPlugin*    plugin,
-                         BufferFactory&     bufs,
-                         const std::string& path,
-                         bool               polyphonic,
-                         PatchImpl*         parent,
-                         SampleRate         srate)
-	: NodeImpl(plugin, path, false, parent, srate)
+TriggerNode::TriggerNode(InternalPlugin*     plugin,
+                         BufferFactory&      bufs,
+                         const Raul::Symbol& symbol,
+                         bool                polyphonic,
+                         PatchImpl*          parent,
+                         SampleRate          srate)
+	: NodeImpl(plugin, symbol, false, parent, srate)
 	, _learning(false)
 {
 	const Ingen::URIs& uris = bufs.uris();
 	_ports = new Raul::Array<PortImpl*>(5);
 
-	_midi_in_port = new InputPort(bufs, this, "input", 0, 1,
+	_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
 	                              PortType::ATOM, uris.atom_Sequence, Raul::Atom());
 	_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
 	_ports->at(0) = _midi_in_port;
 
-	_note_port = new InputPort(bufs, this, "note", 1, 1,
+	_note_port = new InputPort(bufs, this, Raul::Symbol("note"), 1, 1,
 	                           PortType::CONTROL, 0, bufs.forge().make(60.0f));
 	_note_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f));
 	_note_port->set_property(uris.lv2_maximum, bufs.forge().make(127.0f));
@@ -69,19 +69,19 @@ TriggerNode::TriggerNode(InternalPlugin*    plugin,
 	_note_port->set_property(uris.lv2_name, bufs.forge().alloc("Note"));
 	_ports->at(1) = _note_port;
 
-	_gate_port = new OutputPort(bufs, this, "gate", 2, 1,
+	_gate_port = new OutputPort(bufs, this, Raul::Symbol("gate"), 2, 1,
 	                            PortType::CV, 0, bufs.forge().make(0.0f));
 	_gate_port->set_property(uris.lv2_portProperty, uris.lv2_toggled);
 	_gate_port->set_property(uris.lv2_name, bufs.forge().alloc("Gate"));
 	_ports->at(2) = _gate_port;
 
-	_trig_port = new OutputPort(bufs, this, "trigger", 3, 1,
+	_trig_port = new OutputPort(bufs, this, Raul::Symbol("trigger"), 3, 1,
 	                            PortType::CV, 0, bufs.forge().make(0.0f));
 	_trig_port->set_property(uris.lv2_portProperty, uris.lv2_toggled);
 	_trig_port->set_property(uris.lv2_name, bufs.forge().alloc("Trigger"));
 	_ports->at(3) = _trig_port;
 
-	_vel_port = new OutputPort(bufs, this, "velocity", 4, 1,
+	_vel_port = new OutputPort(bufs, this, Raul::Symbol("velocity"), 4, 1,
 	                           PortType::CV, 0, bufs.forge().make(0.0f));
 	_vel_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f));
 	_vel_port->set_property(uris.lv2_maximum, bufs.forge().make(1.0f));
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index a9a561ee..f9953718 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -42,12 +42,12 @@ namespace Internals {
 class TriggerNode : public NodeImpl
 {
 public:
-	TriggerNode(InternalPlugin*    plugin,
-	            BufferFactory&     bufs,
-	            const std::string& path,
-	            bool               polyphonic,
-	            PatchImpl*         parent,
-	            SampleRate         srate);
+	TriggerNode(InternalPlugin*     plugin,
+	            BufferFactory&      bufs,
+	            const Raul::Symbol& symbol,
+	            bool                polyphonic,
+	            PatchImpl*          parent,
+	            SampleRate          srate);
 
 	void process(ProcessContext& context);