diff options
author | David Robillard <d@drobilla.net> | 2016-09-11 15:21:25 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2016-09-11 15:21:25 +0200 |
commit | f3546d49dbd2d673138387a87bc523c26dcece68 (patch) | |
tree | ede285a773fc565205f82a2b0a62ebba6ea552e0 /src/server/internals | |
parent | fb2744d4265d26fb98b19689b50d127f32c66eab (diff) | |
download | ingen-f3546d49dbd2d673138387a87bc523c26dcece68.tar.gz ingen-f3546d49dbd2d673138387a87bc523c26dcece68.tar.bz2 ingen-f3546d49dbd2d673138387a87bc523c26dcece68.zip |
Remove last vestiges of multiple run contexts
Diffstat (limited to 'src/server/internals')
-rw-r--r-- | src/server/internals/Controller.cpp | 6 | ||||
-rw-r--r-- | src/server/internals/Controller.hpp | 4 | ||||
-rw-r--r-- | src/server/internals/Delay.cpp | 4 | ||||
-rw-r--r-- | src/server/internals/Delay.hpp | 2 | ||||
-rw-r--r-- | src/server/internals/Note.cpp | 24 | ||||
-rw-r--r-- | src/server/internals/Note.hpp | 22 | ||||
-rw-r--r-- | src/server/internals/Time.cpp | 4 | ||||
-rw-r--r-- | src/server/internals/Time.hpp | 2 | ||||
-rw-r--r-- | src/server/internals/Trigger.cpp | 8 | ||||
-rw-r--r-- | src/server/internals/Trigger.hpp | 6 |
10 files changed, 41 insertions, 41 deletions
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 62400efa..be015af5 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -27,7 +27,7 @@ #include "InternalPlugin.hpp" #include "OutputPort.hpp" #include "PostProcessor.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "util.hpp" using namespace std; @@ -100,7 +100,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, } void -ControllerNode::run(ProcessContext& context) +ControllerNode::run(RunContext& context) { Buffer* const midi_in = _midi_in_port->buffer(0).get(); LV2_Atom_Sequence* seq = midi_in->get<LV2_Atom_Sequence>(); @@ -115,7 +115,7 @@ ControllerNode::run(ProcessContext& context) } void -ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t val, FrameTime time) +ControllerNode::control(RunContext& context, uint8_t control_num, uint8_t val, FrameTime time) { Sample scaled_value; diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 1c3e05f0..31751658 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -45,9 +45,9 @@ public: GraphImpl* parent, SampleRate srate); - void run(ProcessContext& context); + void run(RunContext& context); - void control(ProcessContext& context, uint8_t control_num, uint8_t val, FrameTime time); + void control(RunContext& context, uint8_t control_num, uint8_t val, FrameTime time); void learn() { _learning = true; } diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp index d0413689..6ac97008 100644 --- a/src/server/internals/Delay.cpp +++ b/src/server/internals/Delay.cpp @@ -29,7 +29,7 @@ #include "InputPort.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "internals/Delay.hpp" #include "util.hpp" @@ -138,7 +138,7 @@ static inline float cube_interp(const float fr, const float inm1, const float } void -DelayNode::run(ProcessContext& context) +DelayNode::run(RunContext& context) { Buffer* const delay_buf = _delay_port->buffer(0).get(); Buffer* const in_buf = _in_port->buffer(0).get(); diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp index 24f2854e..0dc5da30 100644 --- a/src/server/internals/Delay.hpp +++ b/src/server/internals/Delay.hpp @@ -46,7 +46,7 @@ public: void activate(BufferFactory& bufs); - void run(ProcessContext& context); + void run(RunContext& context); static InternalPlugin* internal_plugin(URIs& uris); diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index c3ebaf71..564ae34c 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -28,7 +28,7 @@ #include "InputPort.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "ingen_config.h" #include "internals/Note.hpp" #include "util.hpp" @@ -151,7 +151,7 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly) } bool -NoteNode::apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly) +NoteNode::apply_poly(RunContext& context, Raul::Maid& maid, uint32_t poly) { if (!BlockImpl::apply_poly(context, maid, poly)) return false; @@ -168,7 +168,7 @@ NoteNode::apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly) } void -NoteNode::run(ProcessContext& context) +NoteNode::run(RunContext& context) { Buffer* const midi_in = _midi_in_port->buffer(0).get(); LV2_Atom_Sequence* seq = midi_in->get<LV2_Atom_Sequence>(); @@ -227,7 +227,7 @@ note_to_freq(uint8_t num) } void -NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) +NoteNode::note_on(RunContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) { assert(time >= context.start() && time <= context.end()); assert(note_num <= 127); @@ -306,7 +306,7 @@ NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, F } void -NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) +NoteNode::note_off(RunContext& context, uint8_t note_num, FrameTime time) { assert(time >= context.start() && time <= context.end()); @@ -328,7 +328,7 @@ NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) } void -NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time) +NoteNode::free_voice(RunContext& context, uint32_t voice, FrameTime time) { assert(time >= context.start() && time <= context.end()); @@ -366,7 +366,7 @@ NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time) } void -NoteNode::all_notes_off(ProcessContext& context, FrameTime time) +NoteNode::all_notes_off(RunContext& context, FrameTime time) { assert(time >= context.start() && time <= context.end()); @@ -379,13 +379,13 @@ NoteNode::all_notes_off(ProcessContext& context, FrameTime time) } void -NoteNode::sustain_on(ProcessContext& context, FrameTime time) +NoteNode::sustain_on(RunContext& context, FrameTime time) { _sustain = true; } void -NoteNode::sustain_off(ProcessContext& context, FrameTime time) +NoteNode::sustain_off(RunContext& context, FrameTime time) { assert(time >= context.start() && time <= context.end()); @@ -397,13 +397,13 @@ NoteNode::sustain_off(ProcessContext& context, FrameTime time) } void -NoteNode::bend(ProcessContext& context, FrameTime time, float amount) +NoteNode::bend(RunContext& context, FrameTime time, float amount) { _bend_port->set_control_value(context, time, amount); } void -NoteNode::note_pressure(ProcessContext& context, FrameTime time, uint8_t note_num, float amount) +NoteNode::note_pressure(RunContext& context, FrameTime time, uint8_t note_num, float amount) { for (uint32_t i=0; i < _polyphony; ++i) { if ((*_voices)[i].state != Voice::State::FREE && (*_voices)[i].note == note_num) { @@ -414,7 +414,7 @@ NoteNode::note_pressure(ProcessContext& context, FrameTime time, uint8_t note_nu } void -NoteNode::channel_pressure(ProcessContext& context, FrameTime time, float amount) +NoteNode::channel_pressure(RunContext& context, FrameTime time, float amount) { _pressure_port->set_control_value(context, time, amount); } diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 6e993f06..08d1b358 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -48,20 +48,20 @@ public: ~NoteNode(); bool prepare_poly(BufferFactory& bufs, uint32_t poly); - bool apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly); + bool apply_poly(RunContext& context, Raul::Maid& maid, uint32_t poly); - void run(ProcessContext& context); + void run(RunContext& context); - void note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); - void note_off(ProcessContext& context, uint8_t note_num, FrameTime time); - void all_notes_off(ProcessContext& context, FrameTime time); + void note_on(RunContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); + void note_off(RunContext& context, uint8_t note_num, FrameTime time); + void all_notes_off(RunContext& context, FrameTime time); - void sustain_on(ProcessContext& context, FrameTime time); - void sustain_off(ProcessContext& context, FrameTime time); + void sustain_on(RunContext& context, FrameTime time); + void sustain_off(RunContext& context, FrameTime time); - void bend(ProcessContext& context, FrameTime time, float amount); - void note_pressure(ProcessContext& context, FrameTime time, uint8_t note_num, float amount); - void channel_pressure(ProcessContext& context, FrameTime time, float amount); + void bend(RunContext& context, FrameTime time, float amount); + void note_pressure(RunContext& context, FrameTime time, uint8_t note_num, float amount); + void channel_pressure(RunContext& context, FrameTime time, float amount); static InternalPlugin* internal_plugin(URIs& uris); @@ -84,7 +84,7 @@ private: SampleCount time; }; - void free_voice(ProcessContext& context, uint32_t voice, FrameTime time); + void free_voice(RunContext& context, uint32_t voice, FrameTime time); Raul::Array<Voice>* _voices; Raul::Array<Voice>* _prepared_voices; diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index 13f63538..0f4bdd56 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -23,7 +23,7 @@ #include "Engine.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "internals/Time.hpp" #include "util.hpp" @@ -57,7 +57,7 @@ TimeNode::TimeNode(InternalPlugin* plugin, } void -TimeNode::run(ProcessContext& context) +TimeNode::run(RunContext& context) { BufferRef buf = _notify_port->buffer(0); LV2_Atom_Sequence* seq = buf->get<LV2_Atom_Sequence>(); diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp index f8dfbd64..1a063f8d 100644 --- a/src/server/internals/Time.hpp +++ b/src/server/internals/Time.hpp @@ -44,7 +44,7 @@ public: GraphImpl* parent, SampleRate srate); - void run(ProcessContext& context); + void run(RunContext& context); static InternalPlugin* internal_plugin(URIs& uris); diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index d34b38c1..49a3a2ed 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -25,7 +25,7 @@ #include "InputPort.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "ingen_config.h" #include "internals/Trigger.hpp" #include "util.hpp" @@ -96,7 +96,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, } void -TriggerNode::run(ProcessContext& context) +TriggerNode::run(RunContext& context) { Buffer* const midi_in = _midi_in_port->buffer(0).get(); LV2_Atom_Sequence* seq = midi_in->get<LV2_Atom_Sequence>(); @@ -130,7 +130,7 @@ TriggerNode::run(ProcessContext& context) } void -TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) +TriggerNode::note_on(RunContext& context, uint8_t note_num, uint8_t velocity, FrameTime time) { assert(time >= context.start() && time <= context.end()); @@ -150,7 +150,7 @@ TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity } void -TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) +TriggerNode::note_off(RunContext& context, uint8_t note_num, FrameTime time) { assert(time >= context.start() && time <= context.end()); diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index f486ef38..801e97f6 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -48,10 +48,10 @@ public: GraphImpl* parent, SampleRate srate); - void run(ProcessContext& context); + void run(RunContext& context); - void note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); - void note_off(ProcessContext& context, uint8_t note_num, FrameTime time); + void note_on(RunContext& context, uint8_t note_num, uint8_t velocity, FrameTime time); + void note_off(RunContext& context, uint8_t note_num, FrameTime time); void learn() { _learning = true; } |