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/events | |
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/events')
27 files changed, 33 insertions, 37 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 09838978..66f726a6 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -140,7 +140,7 @@ Connect::pre_process() } void -Connect::execute(ProcessContext& context) +Connect::execute(RunContext& context) { if (_status == Status::SUCCESS) { _head->add_arc(context, _arc.get()); diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index bd15d6d3..84b2854b 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -53,7 +53,7 @@ public: const Raul::Path& head); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 34a63e58..0ff53843 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -194,7 +194,7 @@ Copy::filesystem_to_engine() } void -Copy::execute(ProcessContext& context) +Copy::execute(RunContext& context) { if (_block) { _parent->set_compiled_graph(_compiled_graph); diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index a1726cc6..68ee31da 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -47,7 +47,7 @@ public: const Raul::URI& new_uri); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index cde15622..28afe4b2 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -147,7 +147,7 @@ CreateBlock::pre_process() } void -CreateBlock::execute(ProcessContext& context) +CreateBlock::execute(RunContext& context) { if (_block) { _graph->set_compiled_graph(_compiled_graph); diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 1282fe8b..00205c6a 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -48,7 +48,7 @@ public: ~CreateBlock(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index b5cffcb0..ca36f258 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -186,7 +186,7 @@ CreateGraph::pre_process() } void -CreateGraph::execute(ProcessContext& context) +CreateGraph::execute(RunContext& context) { if (_graph) { if (_parent) { diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index efeabf48..9cae32ba 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -45,7 +45,7 @@ public: const Resource::Properties& properties); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 0e512852..9384ce09 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -167,7 +167,7 @@ CreatePort::pre_process() } void -CreatePort::execute(ProcessContext& context) +CreatePort::execute(RunContext& context) { if (_status == Status::SUCCESS) { _old_ports_array = _graph->external_ports(); diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 754a238f..c002df59 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -52,7 +52,7 @@ public: const Resource::Properties& properties); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index 915c56fc..5ca70a3a 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -116,7 +116,7 @@ Delete::pre_process() } void -Delete::execute(ProcessContext& context) +Delete::execute(RunContext& context) { if (_status != Status::SUCCESS) { return; diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index c6e38839..5cd40b14 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -55,7 +55,7 @@ public: ~Delete(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index e41d6a87..d54ec53f 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -479,7 +479,7 @@ Delta::pre_process() } void -Delta::execute(ProcessContext& context) +Delta::execute(RunContext& context) { if (_status != Status::SUCCESS || _preset) { return; diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index b1f2d66a..8b00fd3a 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -74,7 +74,7 @@ public: uint32_t type); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 43febed5..8d47ac5a 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -29,7 +29,7 @@ #include "InputPort.hpp" #include "OutputPort.hpp" #include "PortImpl.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "ThreadManager.hpp" #include "events/Disconnect.hpp" @@ -173,7 +173,7 @@ Disconnect::pre_process() } bool -Disconnect::Impl::execute(ProcessContext& context, bool set_head_buffers) +Disconnect::Impl::execute(RunContext& context, bool set_head_buffers) { ArcImpl* const port_arc = _head->remove_arc(context, _tail); @@ -200,7 +200,7 @@ Disconnect::Impl::execute(ProcessContext& context, bool set_head_buffers) } void -Disconnect::execute(ProcessContext& context) +Disconnect::execute(RunContext& context) { if (_status == Status::SUCCESS) { if (_impl->execute(context, true)) { diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 8a69dac4..69d9469c 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -55,7 +55,7 @@ public: ~Disconnect(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); @@ -66,7 +66,7 @@ public: OutputPort* t, InputPort* h); - bool execute(ProcessContext& context, bool set_head_buffers); + bool execute(RunContext& context, bool set_head_buffers); inline OutputPort* tail() { return _tail; } inline InputPort* head() { return _head; } diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index ee19797e..380aced5 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -143,7 +143,7 @@ DisconnectAll::pre_process() } void -DisconnectAll::execute(ProcessContext& context) +DisconnectAll::execute(RunContext& context) { if (_status == Status::SUCCESS) { for (auto& i : _impls) { diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index f8123a45..1ddfc536 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -57,7 +57,7 @@ public: ~DisconnectAll(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index fc5fcb13..f685df21 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -48,7 +48,7 @@ public: const Raul::URI& uri); bool pre_process(); - void execute(ProcessContext& context) {} + void execute(RunContext& context) {} void post_process(); private: diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index 0e14f008..32648649 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -51,7 +51,7 @@ Mark::pre_process() } void -Mark::execute(ProcessContext& context) +Mark::execute(RunContext& context) {} void diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index 995df746..895a309c 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -41,7 +41,7 @@ public: Type type); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); private: diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index a51617cb..b30c2ec2 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -74,7 +74,7 @@ Move::pre_process() } void -Move::execute(ProcessContext& context) +Move::execute(RunContext& context) { } diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 74d32c61..ef308a01 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -46,7 +46,7 @@ public: ~Move(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); void undo(Interface& target); diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index fd10c94f..0fac88c2 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -26,7 +26,7 @@ #include "Driver.hpp" #include "Engine.hpp" #include "PortImpl.hpp" -#include "ProcessContext.hpp" +#include "RunContext.hpp" #include "SetPortValue.hpp" namespace Ingen { @@ -69,19 +69,15 @@ SetPortValue::pre_process() } void -SetPortValue::execute(ProcessContext& context) +SetPortValue::execute(RunContext& context) { assert(_time >= context.start() && _time <= context.end()); - - if (_port->parent_block()->context() == Context::ID::MESSAGE) - return; - apply(context); _engine.control_bindings()->port_value_changed(context, _port, _binding, _value); } void -SetPortValue::apply(Context& context) +SetPortValue::apply(RunContext& context) { if (_status != Status::SUCCESS) { return; diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 80d0b84a..7b49096f 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -48,13 +48,13 @@ public: ~SetPortValue(); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); bool synthetic() const { return _synthetic; } private: - void apply(Context& context); + void apply(RunContext& context); PortImpl* _port; const Atom _value; diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index 28b8e188..06289aa1 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -62,7 +62,7 @@ Undo::pre_process() } void -Undo::execute(ProcessContext& context) +Undo::execute(RunContext& context) { } diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp index fff06b8d..c95daea9 100644 --- a/src/server/events/Undo.hpp +++ b/src/server/events/Undo.hpp @@ -39,7 +39,7 @@ public: bool is_redo); bool pre_process(); - void execute(ProcessContext& context); + void execute(RunContext& context); void post_process(); private: |