diff options
author | David Robillard <d@drobilla.net> | 2017-12-16 23:47:08 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2017-12-16 23:47:08 +0100 |
commit | af51373cadb57d8b31ccb3c359e7c80d8f697487 (patch) | |
tree | dd8f74b5bb14acd8ec100f691d46d3f300445531 /src/server/events/Mark.cpp | |
parent | 68901d7caa0636895de593e0b23cdec4fb53deaa (diff) | |
download | ingen-af51373cadb57d8b31ccb3c359e7c80d8f697487.tar.gz ingen-af51373cadb57d8b31ccb3c359e7c80d8f697487.tar.bz2 ingen-af51373cadb57d8b31ccb3c359e7c80d8f697487.zip |
Make events take the corresponding message directly
Diffstat (limited to 'src/server/events/Mark.cpp')
-rw-r--r-- | src/server/events/Mark.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index abba85e8..93ab3071 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -23,13 +23,21 @@ namespace Ingen { namespace Server { namespace Events { -Mark::Mark(Engine& engine, - SPtr<Interface> client, - int32_t id, - SampleCount timestamp, - Type type) - : Event(engine, client, id, timestamp) - , _type(type) +Mark::Mark(Engine& engine, + SPtr<Interface> client, + SampleCount timestamp, + const Ingen::BundleBegin& msg) + : Event(engine, client, msg.seq, timestamp) + , _type(Type::BUNDLE_BEGIN) + , _depth(0) +{} + +Mark::Mark(Engine& engine, + SPtr<Interface> client, + SampleCount timestamp, + const Ingen::BundleEnd& msg) + : Event(engine, client, msg.seq, timestamp) + , _type(Type::BUNDLE_END) , _depth(0) {} @@ -45,7 +53,7 @@ Mark::pre_process(PreProcessContext& ctx) : _engine.undo_stack()); switch (_type) { - case Type::BUNDLE_START: + case Type::BUNDLE_BEGIN: ctx.set_in_bundle(true); _depth = stack->start_entry(); break; @@ -89,7 +97,7 @@ Mark::get_execution() const } switch (_type) { - case Type::BUNDLE_START: + case Type::BUNDLE_BEGIN: if (_depth == 1) { return Execution::BLOCK; } |