Merge NodeBase and NodeImpl.

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

8 files changed, 23 insertions, 23 deletions

diff --git a/src/engine/internals/Controller.cpp b/src/engine/internals/Controller.cpp
index 870dfc8e..aeeb1cd1 100644
--- a/src/engine/internals/Controller.cpp
+++ b/src/engine/internals/Controller.cpp
@@ -45,7 +45,7 @@ ControllerNode::ControllerNode(BufferFactory& bufs,
                                bool           polyphonic,
                                PatchImpl*     parent,
                                SampleRate     srate)
-	: NodeBase(&controller_plugin, path, false, parent, srate)
+	: NodeImpl(&controller_plugin, path, false, parent, srate)
 	, _learning(false)
 {
 	const LV2URIMap& uris = Shared::LV2URIMap::instance();
@@ -84,7 +84,7 @@ ControllerNode::ControllerNode(BufferFactory& bufs,
 void
 ControllerNode::process(ProcessContext& context)
 {
-	NodeBase::pre_process(context);
+	NodeImpl::pre_process(context);
 
 	uint32_t frames    = 0;
 	uint32_t subframes = 0;
@@ -104,7 +104,7 @@ ControllerNode::process(ProcessContext& context)
 		midi_in->increment();
 	}
 
-	NodeBase::post_process(context);
+	NodeImpl::post_process(context);
 }
 
 
diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp
index b6d7302f..b3363665 100644
--- a/src/engine/internals/Controller.hpp
+++ b/src/engine/internals/Controller.hpp
@@ -19,7 +19,7 @@
 #define INGEN_INTERNALS_CONTROLLER_HPP
 
 #include <string>
-#include "NodeBase.hpp"
+#include "NodeImpl.hpp"
 
 namespace Ingen {
 
@@ -37,7 +37,7 @@ namespace Internals {
  *
  * \ingroup engine
  */
-class ControllerNode : public NodeBase
+class ControllerNode : public NodeImpl
 {
 public:
 	ControllerNode(BufferFactory& bufs, const std::string& path, bool polyphonic, PatchImpl* parent, SampleRate srate);
diff --git a/src/engine/internals/Delay.cpp b/src/engine/internals/Delay.cpp
index 202ba616..7910713f 100644
--- a/src/engine/internals/Delay.cpp
+++ b/src/engine/internals/Delay.cpp
@@ -54,7 +54,7 @@ static InternalPlugin note_plugin(NS_INTERNALS "Delay", "delay");
 InternalPlugin& DelayNode::internal_plugin() { return note_plugin; }
 
 DelayNode::DelayNode(BufferFactory& bufs, const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate)
-	: NodeBase(&note_plugin, path, polyphonic, parent, srate)
+	: NodeImpl(&note_plugin, path, polyphonic, parent, srate)
 	, _buffer(0)
 	, _buffer_length(0)
 	, _buffer_mask(0)
@@ -97,7 +97,7 @@ DelayNode::~DelayNode()
 void
 DelayNode::activate(BufferFactory& bufs)
 {
-	NodeBase::activate(bufs);
+	NodeImpl::activate(bufs);
 	const SampleCount min_size = MAX_DELAY_SECONDS * _srate;
 
 	// Smallest power of two larger than min_size
@@ -142,7 +142,7 @@ DelayNode::process(ProcessContext& context)
 	AudioBuffer* const in_buf    = (AudioBuffer*)_in_port->buffer(0).get();
 	AudioBuffer* const out_buf   = (AudioBuffer*)_out_port->buffer(0).get();
 
-	NodeBase::pre_process(context);
+	NodeImpl::pre_process(context);
 
 	DelayNode* plugin_data = this;
 
@@ -199,7 +199,7 @@ DelayNode::process(ProcessContext& context)
 
 	_write_phase = write_phase;
 
-	NodeBase::post_process(context);
+	NodeImpl::post_process(context);
 }
 
 
diff --git a/src/engine/internals/Delay.hpp b/src/engine/internals/Delay.hpp
index 077c65f9..758d32e7 100644
--- a/src/engine/internals/Delay.hpp
+++ b/src/engine/internals/Delay.hpp
@@ -23,7 +23,7 @@
 #include "types.hpp"
 //#include "Buffer.hpp"
 //#include "BufferFactory.hpp"
-#include "NodeBase.hpp"
+#include "NodeImpl.hpp"
 
 namespace Ingen {
 
@@ -41,7 +41,7 @@ namespace Internals {
  *
  * \ingroup engine
  */
-class DelayNode : public NodeBase
+class DelayNode : public NodeImpl
 {
 public:
 	DelayNode(BufferFactory& bufs, const std::string& path, bool polyphonic, PatchImpl* parent, SampleRate srate);
diff --git a/src/engine/internals/Note.cpp b/src/engine/internals/Note.cpp
index fd2dee71..298af84a 100644
--- a/src/engine/internals/Note.cpp
+++ b/src/engine/internals/Note.cpp
@@ -48,7 +48,7 @@ static InternalPlugin note_plugin(NS_INTERNALS "Note", "note");
 InternalPlugin& NoteNode::internal_plugin() { return note_plugin; }
 
 NoteNode::NoteNode(BufferFactory& bufs, const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate)
-	: NodeBase(&note_plugin, path, polyphonic, parent, srate)
+	: NodeImpl(&note_plugin, path, polyphonic, parent, srate)
 	, _voices(new Raul::Array<Voice>(_polyphony))
 	, _prepared_voices(NULL)
 	, _sustain(false)
@@ -94,7 +94,7 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
 	if (!_polyphonic)
 		return true;
 
-	NodeBase::prepare_poly(bufs, poly);
+	NodeImpl::prepare_poly(bufs, poly);
 
 	if (_prepared_voices && poly <= _prepared_voices->size())
 		return true;
@@ -108,7 +108,7 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
 bool
 NoteNode::apply_poly(Raul::Maid& maid, uint32_t poly)
 {
-	if (!NodeBase::apply_poly(maid, poly))
+	if (!NodeImpl::apply_poly(maid, poly))
 		return false;
 
 	if (_prepared_voices) {
@@ -127,7 +127,7 @@ void
 NoteNode::process(ProcessContext& context)
 {
 	EventBuffer* const midi_in = (EventBuffer*)_midi_in_port->buffer(0).get();
-	NodeBase::pre_process(context);
+	NodeImpl::pre_process(context);
 
 	uint32_t frames    = 0;
 	uint32_t subframes = 0;
@@ -195,7 +195,7 @@ NoteNode::process(ProcessContext& context)
 		}
 	}
 
-	NodeBase::post_process(context);
+	NodeImpl::post_process(context);
 }
 
 
diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp
index 8ad7f452..2866fb01 100644
--- a/src/engine/internals/Note.hpp
+++ b/src/engine/internals/Note.hpp
@@ -20,7 +20,7 @@
 
 #include <string>
 #include "types.hpp"
-#include "NodeBase.hpp"
+#include "NodeImpl.hpp"
 
 namespace Ingen {
 
@@ -37,7 +37,7 @@ namespace Internals {
  *
  * \ingroup engine
  */
-class NoteNode : public NodeBase
+class NoteNode : public NodeImpl
 {
 public:
 	NoteNode(BufferFactory& bufs, const std::string& path, bool polyphonic, PatchImpl* parent, SampleRate srate);
diff --git a/src/engine/internals/Trigger.cpp b/src/engine/internals/Trigger.cpp
index c8d6b77e..ed3b2d90 100644
--- a/src/engine/internals/Trigger.cpp
+++ b/src/engine/internals/Trigger.cpp
@@ -44,7 +44,7 @@ static InternalPlugin trigger_plugin(NS_INTERNALS "Trigger", "trigger");
 InternalPlugin& TriggerNode::internal_plugin() { return trigger_plugin; }
 
 TriggerNode::TriggerNode(BufferFactory& bufs, const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate)
-	: NodeBase(&trigger_plugin, path, false, parent, srate)
+	: NodeImpl(&trigger_plugin, path, false, parent, srate)
 	, _learning(false)
 {
 	const LV2URIMap& uris = LV2URIMap::instance();
@@ -82,7 +82,7 @@ TriggerNode::TriggerNode(BufferFactory& bufs, const string& path, bool polyphoni
 void
 TriggerNode::process(ProcessContext& context)
 {
-	NodeBase::pre_process(context);
+	NodeImpl::pre_process(context);
 
 	uint32_t frames = 0;
 	uint32_t subframes = 0;
@@ -120,7 +120,7 @@ TriggerNode::process(ProcessContext& context)
 		midi_in->increment();
 	}
 
-	NodeBase::post_process(context);
+	NodeImpl::post_process(context);
 }
 
 
diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp
index 53aba06f..5513f6d8 100644
--- a/src/engine/internals/Trigger.hpp
+++ b/src/engine/internals/Trigger.hpp
@@ -19,7 +19,7 @@
 #define INGEN_INTERNALS_TRIGGER_HPP
 
 #include <string>
-#include "NodeBase.hpp"
+#include "NodeImpl.hpp"
 
 namespace Ingen {
 
@@ -40,7 +40,7 @@ namespace Internals {
  *
  * \ingroup engine
  */
-class TriggerNode : public NodeBase
+class TriggerNode : public NodeImpl
 {
 public:
 	TriggerNode(BufferFactory& bufs, const std::string& path, bool polyphonic, PatchImpl* parent, SampleRate srate);