From d13e41341f687b9f526887aba7e664d71ae34aec Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 1 Aug 2020 17:51:16 +0200 Subject: Use consistent naming for context parameters --- src/server/events/Connect.cpp | 6 +++--- src/server/events/Connect.hpp | 2 +- src/server/events/Copy.hpp | 2 +- src/server/events/CreateBlock.hpp | 2 +- src/server/events/CreateGraph.cpp | 4 ++-- src/server/events/CreateGraph.hpp | 2 +- src/server/events/CreatePort.cpp | 4 ++-- src/server/events/CreatePort.hpp | 2 +- src/server/events/Delete.cpp | 10 +++++----- src/server/events/Delete.hpp | 2 +- src/server/events/Delta.cpp | 20 ++++++++++---------- src/server/events/Delta.hpp | 2 +- src/server/events/Disconnect.cpp | 10 +++++----- src/server/events/Disconnect.hpp | 4 ++-- src/server/events/DisconnectAll.cpp | 4 ++-- src/server/events/DisconnectAll.hpp | 2 +- src/server/events/Get.cpp | 5 +++++ src/server/events/Get.hpp | 2 +- src/server/events/Mark.cpp | 2 +- src/server/events/Mark.hpp | 2 +- src/server/events/Move.cpp | 2 +- src/server/events/Move.hpp | 2 +- src/server/events/SetPortValue.cpp | 20 ++++++++++---------- src/server/events/SetPortValue.hpp | 4 ++-- src/server/events/Undo.cpp | 2 +- src/server/events/Undo.hpp | 2 +- 26 files changed, 63 insertions(+), 58 deletions(-) (limited to 'src/server/events') diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 2df73b21..eabcad73 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -151,12 +151,12 @@ Connect::pre_process(PreProcessContext& ctx) } void -Connect::execute(RunContext& context) +Connect::execute(RunContext& ctx) { if (_status == Status::SUCCESS) { - _head->add_arc(context, *_arc.get()); + _head->add_arc(ctx, *_arc.get()); if (!_head->is_driver_port()) { - _head->set_voices(context, std::move(_voices)); + _head->set_voices(ctx, std::move(_voices)); } _head->connect_buffers(); if (_compiled_graph) { diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index adc80afc..305ad7a8 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -44,7 +44,7 @@ public: const ingen::Connect& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index 26673a55..aa1eae5d 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -41,7 +41,7 @@ public: const ingen::Copy& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 00f58008..a9f43a80 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -46,7 +46,7 @@ public: Properties& properties); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 4e031276..7a1d9a75 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -188,7 +188,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) } void -CreateGraph::execute(RunContext& context) +CreateGraph::execute(RunContext& ctx) { if (_graph) { if (_parent) { @@ -201,7 +201,7 @@ CreateGraph::execute(RunContext& context) } for (const auto& ev : _child_events) { - ev->execute(context); + ev->execute(ctx); } } } diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index dadb644e..4ab3f4af 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -48,7 +48,7 @@ public: const Properties& properties); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index e6862731..2520378c 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -180,7 +180,7 @@ CreatePort::pre_process(PreProcessContext&) } void -CreatePort::execute(RunContext& context) +CreatePort::execute(RunContext& ctx) { if (_status == Status::SUCCESS) { const MPtr& old_ports = _graph->external_ports(); @@ -196,7 +196,7 @@ CreatePort::execute(RunContext& context) _graph->set_external_ports(std::move(_ports_array)); if (_engine_port) { - _engine.driver()->add_port(context, _engine_port); + _engine.driver()->add_port(ctx, _engine_port); } } } diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 8137328d..9ad8987a 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -52,7 +52,7 @@ public: const Properties& properties); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index e91ab5ef..d0a77a31 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -138,18 +138,18 @@ Delete::pre_process(PreProcessContext& ctx) } void -Delete::execute(RunContext& context) +Delete::execute(RunContext& ctx) { if (_status != Status::SUCCESS) { return; } if (_disconnect_event) { - _disconnect_event->execute(context); + _disconnect_event->execute(ctx); } if (!_removed_bindings.empty()) { - _engine.control_bindings()->remove(context, _removed_bindings); + _engine.control_bindings()->remove(ctx, _removed_bindings); } GraphImpl* parent = _block ? _block->parent_graph() : nullptr; @@ -158,7 +158,7 @@ Delete::execute(RunContext& context) for (size_t i = 0; i < _ports_array->size(); ++i) { PortImpl* const port = _ports_array->at(i); if (port->index() != i) { - port->set_index(context, i); + port->set_index(ctx, i); } } @@ -167,7 +167,7 @@ Delete::execute(RunContext& context) parent->set_external_ports(std::move(_ports_array)); if (_engine_port) { - _engine.driver()->remove_port(context, _engine_port); + _engine.driver()->remove_port(ctx, _engine_port); } } diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 6b3149e9..a84c2969 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -53,7 +53,7 @@ public: ~Delete(); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index eb70d046..28919a50 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -474,7 +474,7 @@ Delta::pre_process(PreProcessContext& ctx) } void -Delta::execute(RunContext& context) +Delta::execute(RunContext& ctx) { if (_status != Status::SUCCESS || _preset) { return; @@ -484,16 +484,16 @@ Delta::execute(RunContext& context) if (_create_event) { _create_event->set_time(_time); - _create_event->execute(context); + _create_event->execute(ctx); } for (auto& s : _set_events) { s->set_time(_time); - s->execute(context); + s->execute(ctx); } if (!_removed_bindings.empty()) { - _engine.control_bindings()->remove(context, _removed_bindings); + _engine.control_bindings()->remove(ctx, _removed_bindings); } auto* const object = dynamic_cast(_object); @@ -518,7 +518,7 @@ Delta::execute(RunContext& context) } _graph->enable(); } else { - _graph->disable(context); + _graph->disable(ctx); } } else if (block) { block->set_enabled(value.get()); @@ -528,15 +528,15 @@ Delta::execute(RunContext& context) if (object) { if (value.get()) { auto* parent = reinterpret_cast(object->parent()); - object->apply_poly(context, parent->internal_poly_process()); + object->apply_poly(ctx, parent->internal_poly_process()); } else { - object->apply_poly(context, 1); + object->apply_poly(ctx, 1); } } } break; case SpecialType::POLYPHONY: if (_graph && - !_graph->apply_internal_poly(context, + !_graph->apply_internal_poly(ctx, *_engine.buffer_factory(), *_engine.maid(), value.get())) { @@ -545,12 +545,12 @@ Delta::execute(RunContext& context) break; case SpecialType::PORT_INDEX: if (port) { - port->set_index(context, value.get()); + port->set_index(ctx, value.get()); } break; case SpecialType::CONTROL_BINDING: if (port) { - if (!_engine.control_bindings()->set_port_binding(context, port, _binding, value)) { + if (!_engine.control_bindings()->set_port_binding(ctx, port, _binding, value)) { _status = Status::BAD_VALUE; } } else if (block) { diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 1dce2663..629fd77c 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -70,7 +70,7 @@ public: uint32_t type); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 531d70af..2c689a6a 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -165,7 +165,7 @@ Disconnect::pre_process(PreProcessContext& ctx) } bool -Disconnect::Impl::execute(RunContext& context, bool set_head_buffers) +Disconnect::Impl::execute(RunContext& ctx, bool set_head_buffers) { if (!_arc) { return false; @@ -178,9 +178,9 @@ Disconnect::Impl::execute(RunContext& context, bool set_head_buffers) if (set_head_buffers) { if (_voices) { - _head->set_voices(context, std::move(_voices)); + _head->set_voices(ctx, std::move(_voices)); } else { - _head->setup_buffers(context, *_engine.buffer_factory(), _head->poly()); + _head->setup_buffers(ctx, *_engine.buffer_factory(), _head->poly()); } _head->connect_buffers(); } else { @@ -191,10 +191,10 @@ Disconnect::Impl::execute(RunContext& context, bool set_head_buffers) } void -Disconnect::execute(RunContext& context) +Disconnect::execute(RunContext& ctx) { if (_status == Status::SUCCESS) { - if (_impl->execute(context, true)) { + if (_impl->execute(ctx, true)) { if (_compiled_graph) { _graph->set_compiled_graph(std::move(_compiled_graph)); } diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index ec638c73..4b5f6aea 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -43,7 +43,7 @@ public: const ingen::Disconnect& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; @@ -51,7 +51,7 @@ public: public: Impl(Engine& e, GraphImpl* graph, PortImpl* t, InputPort* h); - bool execute(RunContext& context, bool set_head_buffers); + bool execute(RunContext& ctx, bool set_head_buffers); inline PortImpl* tail() { return _tail; } inline InputPort* head() { return _head; } diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 4444bb26..cc4284ff 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -143,11 +143,11 @@ DisconnectAll::pre_process(PreProcessContext& ctx) } void -DisconnectAll::execute(RunContext& context) +DisconnectAll::execute(RunContext& ctx) { if (_status == Status::SUCCESS) { for (auto& i : _impls) { - i->execute(context, + i->execute(ctx, !_deleting || (i->head()->parent_block() != _block)); } } diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 9ab908c1..7be48d82 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -55,7 +55,7 @@ public: ~DisconnectAll(); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 2335c09f..9194226d 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -83,6 +83,11 @@ Get::pre_process(PreProcessContext&) } } +void +Get::execute(RunContext&) +{ +} + void Get::post_process() { diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index e24c9998..0c3d053d 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -45,7 +45,7 @@ public: const ingen::Get& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override {} + void execute(RunContext&) override; void post_process() override; private: diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index eb50e4a0..103c5b3c 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -45,7 +45,7 @@ Mark::Mark(Engine& engine, {} void -Mark::mark(PreProcessContext& ctx) +Mark::mark(PreProcessContext&) { const UPtr& stack = ((_mode == Mode::UNDO) ? _engine.redo_stack() diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index bff38f06..2bcdafb2 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -52,7 +52,7 @@ public: void mark(PreProcessContext& ctx) override; bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; Execution get_execution() const override; diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index f6a39f1f..d7262143 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -69,7 +69,7 @@ Move::pre_process(PreProcessContext&) } void -Move::execute(RunContext& context) +Move::execute(RunContext&) { } diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index b4487b78..5c71ce96 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -42,7 +42,7 @@ public: const ingen::Move& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; void undo(Interface& target) override; diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index f341737c..66511a0c 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -80,15 +80,15 @@ SetPortValue::pre_process(PreProcessContext&) } void -SetPortValue::execute(RunContext& context) +SetPortValue::execute(RunContext& ctx) { - assert(_time >= context.start() && _time <= context.end()); - apply(context); - _engine.control_bindings()->port_value_changed(context, _port, _binding, _value); + assert(_time >= ctx.start() && _time <= ctx.end()); + apply(ctx); + _engine.control_bindings()->port_value_changed(ctx, _port, _binding, _value); } void -SetPortValue::apply(RunContext& context) +SetPortValue::apply(RunContext& ctx) { if (_status != Status::SUCCESS) { return; @@ -98,22 +98,22 @@ SetPortValue::apply(RunContext& context) Buffer* buf = _port->buffer(0).get(); if (_buffer) { - if (_port->user_buffer(context)) { - buf = _port->user_buffer(context).get(); + if (_port->user_buffer(ctx)) { + buf = _port->user_buffer(ctx).get(); } else { - _port->set_user_buffer(context, _buffer); + _port->set_user_buffer(ctx, _buffer); buf = _buffer.get(); } } if (buf->type() == uris.atom_Sound || buf->type() == uris.atom_Float) { if (_value.type() == uris.forge.Float) { - _port->set_control_value(context, _time, _value.get()); + _port->set_control_value(ctx, _time, _value.get()); } else { _status = Status::TYPE_MISMATCH; } } else if (buf->type() == uris.atom_Sequence) { - if (!buf->append_event(_time - context.start(), + if (!buf->append_event(_time - ctx.start(), _value.size(), _value.type(), reinterpret_cast(_value.get_body()))) { diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 99d55af3..df30d514 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -50,13 +50,13 @@ public: bool synthetic = false); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; bool synthetic() const { return _synthetic; } private: - void apply(RunContext& context); + void apply(RunContext& ctx); PortImpl* _port; const Atom _value; diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index 0741e60d..9a60c15f 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -73,7 +73,7 @@ Undo::pre_process(PreProcessContext&) } void -Undo::execute(RunContext& context) +Undo::execute(RunContext&) { } diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp index e36ebaad..1fdaa4dd 100644 --- a/src/server/events/Undo.hpp +++ b/src/server/events/Undo.hpp @@ -43,7 +43,7 @@ public: const ingen::Redo& msg); bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override; + void execute(RunContext& ctx) override; void post_process() override; private: -- cgit v1.2.1