summaryrefslogtreecommitdiffstats
path: root/src/server/internals
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/internals')
-rw-r--r--src/server/internals/Controller.cpp6
-rw-r--r--src/server/internals/Controller.hpp6
-rw-r--r--src/server/internals/Delay.cpp8
-rw-r--r--src/server/internals/Delay.hpp4
-rw-r--r--src/server/internals/Note.cpp10
-rw-r--r--src/server/internals/Note.hpp6
-rw-r--r--src/server/internals/Trigger.cpp6
-rw-r--r--src/server/internals/Trigger.hpp10
8 files changed, 28 insertions, 28 deletions
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 1fb3cf76..0e8d125e 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -47,7 +47,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
bool polyphonic,
PatchImpl* parent,
SampleRate srate)
- : NodeImpl(plugin, symbol, false, parent, srate)
+ : BlockImpl(plugin, symbol, false, parent, srate)
, _learning(false)
{
const Ingen::URIs& uris = bufs.uris();
@@ -91,7 +91,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
void
ControllerNode::process(ProcessContext& context)
{
- NodeImpl::pre_process(context);
+ BlockImpl::pre_process(context);
Buffer* const midi_in = _midi_in_port->buffer(0).get();
LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)midi_in->atom();
@@ -104,7 +104,7 @@ ControllerNode::process(ProcessContext& context)
}
}
- NodeImpl::post_process(context);
+ BlockImpl::post_process(context);
}
void
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index 4a366b08..23401826 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_INTERNALS_CONTROLLER_HPP
#define INGEN_INTERNALS_CONTROLLER_HPP
-#include "NodeImpl.hpp"
+#include "BlockImpl.hpp"
namespace Ingen {
namespace Server {
@@ -28,14 +28,14 @@ class InternalPlugin;
namespace Internals {
-/** MIDI control input node.
+/** MIDI control input block.
*
* Creating one of these nodes is how a user makes "MIDI Bindings". Note that
* this node will always be monophonic, the poly parameter is ignored.
*
* \ingroup engine
*/
-class ControllerNode : public NodeImpl
+class ControllerNode : public BlockImpl
{
public:
ControllerNode(InternalPlugin* plugin,
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 26799260..1e7ed5a5 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -55,7 +55,7 @@ DelayNode::DelayNode(InternalPlugin* plugin,
bool polyphonic,
PatchImpl* parent,
SampleRate srate)
- : NodeImpl(plugin, symbol, polyphonic, parent, srate)
+ : BlockImpl(plugin, symbol, polyphonic, parent, srate)
, _buffer(0)
, _buffer_length(0)
, _buffer_mask(0)
@@ -100,7 +100,7 @@ DelayNode::~DelayNode()
void
DelayNode::activate(BufferFactory& bufs)
{
- NodeImpl::activate(bufs);
+ BlockImpl::activate(bufs);
const SampleRate rate = bufs.engine().driver()->sample_rate();
const SampleCount min_size = MAX_DELAY_SECONDS * rate;
@@ -144,7 +144,7 @@ DelayNode::process(ProcessContext& context)
Buffer* const in_buf = _in_port->buffer(0).get();
Buffer* const out_buf = _out_port->buffer(0).get();
- NodeImpl::pre_process(context);
+ BlockImpl::pre_process(context);
DelayNode* plugin_data = this;
@@ -201,7 +201,7 @@ DelayNode::process(ProcessContext& context)
_write_phase = write_phase;
- NodeImpl::post_process(context);
+ BlockImpl::post_process(context);
}
} // namespace Internals
diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp
index 3c512d2c..8f4b758b 100644
--- a/src/server/internals/Delay.hpp
+++ b/src/server/internals/Delay.hpp
@@ -19,7 +19,7 @@
#include <math.h>
-#include "NodeImpl.hpp"
+#include "BlockImpl.hpp"
#include "types.hpp"
namespace Ingen {
@@ -32,7 +32,7 @@ class BufferFactory;
namespace Internals {
-class DelayNode : public NodeImpl
+class DelayNode : public BlockImpl
{
public:
DelayNode(InternalPlugin* plugin,
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 25e8aee5..00ab0835 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -52,7 +52,7 @@ NoteNode::NoteNode(InternalPlugin* plugin,
bool polyphonic,
PatchImpl* parent,
SampleRate srate)
- : NodeImpl(plugin, symbol, polyphonic, parent, srate)
+ : BlockImpl(plugin, symbol, polyphonic, parent, srate)
, _voices(new Raul::Array<Voice>(_polyphony))
, _prepared_voices(NULL)
, _sustain(false)
@@ -103,7 +103,7 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
if (!_polyphonic)
return true;
- NodeImpl::prepare_poly(bufs, poly);
+ BlockImpl::prepare_poly(bufs, poly);
if (_prepared_voices && poly <= _prepared_voices->size())
return true;
@@ -116,7 +116,7 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
bool
NoteNode::apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly)
{
- if (!NodeImpl::apply_poly(context, maid, poly))
+ if (!BlockImpl::apply_poly(context, maid, poly))
return false;
if (_prepared_voices) {
@@ -133,7 +133,7 @@ NoteNode::apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly)
void
NoteNode::process(ProcessContext& context)
{
- NodeImpl::pre_process(context);
+ BlockImpl::pre_process(context);
Buffer* const midi_in = _midi_in_port->buffer(0).get();
LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)midi_in->atom();
@@ -173,7 +173,7 @@ NoteNode::process(ProcessContext& context)
}
}
- NodeImpl::post_process(context);
+ BlockImpl::post_process(context);
}
void
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index 6c7d9a13..290908e8 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_INTERNALS_NOTE_HPP
#define INGEN_INTERNALS_NOTE_HPP
-#include "NodeImpl.hpp"
+#include "BlockImpl.hpp"
#include "types.hpp"
namespace Ingen {
@@ -29,13 +29,13 @@ class InternalPlugin;
namespace Internals {
-/** MIDI note input node.
+/** MIDI note input block.
*
* For pitched instruments like keyboard, etc.
*
* \ingroup engine
*/
-class NoteNode : public NodeImpl
+class NoteNode : public BlockImpl
{
public:
NoteNode(InternalPlugin* plugin,
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index f7bbd4c5..31943425 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -47,7 +47,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin,
bool polyphonic,
PatchImpl* parent,
SampleRate srate)
- : NodeImpl(plugin, symbol, false, parent, srate)
+ : BlockImpl(plugin, symbol, false, parent, srate)
, _learning(false)
{
const Ingen::URIs& uris = bufs.uris();
@@ -89,7 +89,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin,
void
TriggerNode::process(ProcessContext& context)
{
- NodeImpl::pre_process(context);
+ BlockImpl::pre_process(context);
Buffer* const midi_in = _midi_in_port->buffer(0).get();
LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)midi_in->atom();
@@ -121,7 +121,7 @@ TriggerNode::process(ProcessContext& context)
}
}
- NodeImpl::post_process(context);
+ BlockImpl::post_process(context);
}
void
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index 59badc70..750cd287 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_INTERNALS_TRIGGER_HPP
#define INGEN_INTERNALS_TRIGGER_HPP
-#include "NodeImpl.hpp"
+#include "BlockImpl.hpp"
namespace Ingen {
namespace Server {
@@ -28,17 +28,17 @@ class InternalPlugin;
namespace Internals {
-/** MIDI trigger input node.
+/** MIDI trigger input block.
*
- * Just has a gate, for drums etc. A control port is used to select
+ * Just has a gate, for drums etc. A control port is used to select
* which note number is responded to.
*
- * Note that this node is always monophonic, the poly parameter is ignored.
+ * Note that this block is always monophonic, the poly parameter is ignored.
* (Should that change?)
*
* \ingroup engine
*/
-class TriggerNode : public NodeImpl
+class TriggerNode : public BlockImpl
{
public:
TriggerNode(InternalPlugin* plugin,