diff options
| author | David Robillard <d@drobilla.net> | 2007-04-05 05:50:53 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-05 05:50:53 +0000 |
| commit | 0123cdeacc9acc7ca16fa8b0a9dee7a5d916b7df (patch) | |
| tree | 582897e91977bcb42cfbd88e66af0dad1dd3bb3d /src/engine/machina | |
| parent | 74688702fa060fb6aaa413b06deceec6c78d74a6 (diff) | |
| download | machina-0123cdeacc9acc7ca16fa8b0a9dee7a5d916b7df.tar.gz machina-0123cdeacc9acc7ca16fa8b0a9dee7a5d916b7df.tar.bz2 machina-0123cdeacc9acc7ca16fa8b0a9dee7a5d916b7df.zip | |
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
Diffstat (limited to 'src/engine/machina')
| -rw-r--r-- | src/engine/machina/MachineBuilder.hpp | 1 | ||||
| -rw-r--r-- | src/engine/machina/MidiAction.hpp | 1 | ||||
| -rw-r--r-- | src/engine/machina/Node.hpp | 4 |
3 files changed, 3 insertions, 3 deletions
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> node) const; + void set_node_duration(SharedPtr<Node> node, Raul::BeatTime d) const; SharedPtr<Node> connect_nodes(SharedPtr<Machine> 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<byte> _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<SharedPtr<Edge> > Edges; Edges& outgoing_edges() { return _outgoing_edges; } |