From 0123cdeacc9acc7ca16fa8b0a9dee7a5d916b7df Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 5 Apr 2007 05:50:53 +0000 Subject: Selector states. Togglable edge and state labels. Builder fixes. GUI/input/etc fixes. git-svn-id: http://svn.drobilla.net/lad/machina@398 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/machina/MachineBuilder.hpp | 1 + src/engine/machina/MidiAction.hpp | 1 - src/engine/machina/Node.hpp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/machina') diff --git a/src/engine/machina/MachineBuilder.hpp b/src/engine/machina/MachineBuilder.hpp index ac446c9..25104e8 100644 --- a/src/engine/machina/MachineBuilder.hpp +++ b/src/engine/machina/MachineBuilder.hpp @@ -44,6 +44,7 @@ public: private: bool is_delay_node(SharedPtr node) const; + void set_node_duration(SharedPtr node, Raul::BeatTime d) const; SharedPtr connect_nodes(SharedPtr m, diff --git a/src/engine/machina/MidiAction.hpp b/src/engine/machina/MidiAction.hpp index 60d9189..510c0d0 100644 --- a/src/engine/machina/MidiAction.hpp +++ b/src/engine/machina/MidiAction.hpp @@ -57,7 +57,6 @@ public: private: - size_t _size; const size_t _max_size; Raul::AtomicPtr _event; diff --git a/src/engine/machina/Node.hpp b/src/engine/machina/Node.hpp index b4c72e2..66d1b2d 100644 --- a/src/engine/machina/Node.hpp +++ b/src/engine/machina/Node.hpp @@ -66,13 +66,13 @@ public: bool is_initial() const { return _is_initial; } void set_initial(bool i) { _is_initial = i; } - bool is_selector() const { return _is_selector; } - void set_selector(bool i) { _is_selector = i; } bool is_active() const { return _is_active; } BeatTime enter_time() const { assert(_is_active); return _enter_time; } BeatTime exit_time() const { assert(_is_active); return _enter_time + _duration; } BeatCount duration() { return _duration; } void set_duration(BeatCount d) { _duration = d; } + bool is_selector() const { return _is_selector; } + void set_selector(bool i); typedef Raul::List > Edges; Edges& outgoing_edges() { return _outgoing_edges; } -- cgit v1.2.1