aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-11 21:46:24 +0000
committerDavid Robillard <d@drobilla.net>2013-01-11 21:46:24 +0000
commit5df770bf97b1cc7ac1c73e68fb617164f662d7b7 (patch)
tree72666f920012f757f541deca548e5bb95a665dd7 /src
parentea7bc6c83e7e9131f6bfb799f4b8e5f864bd1d4f (diff)
downloadmachina-5df770bf97b1cc7ac1c73e68fb617164f662d7b7.tar.gz
machina-5df770bf97b1cc7ac1c73e68fb617164f662d7b7.tar.bz2
machina-5df770bf97b1cc7ac1c73e68fb617164f662d7b7.zip
Shrink Machine via better alignment.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4924 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/engine/Machine.cpp2
-rw-r--r--src/engine/machina/Machine.hpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp
index 24e6aaf..9538be2 100644
--- a/src/engine/Machine.cpp
+++ b/src/engine/Machine.cpp
@@ -40,9 +40,9 @@ namespace Machina {
Machine::Machine(TimeUnit unit)
: _active_nodes(MAX_ACTIVE_NODES, SharedPtr<Node>())
+ , _time(unit, 0, 0)
, _is_activated(false)
, _is_finished(false)
- , _time(unit, 0, 0)
{
}
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 0109742..6691b43 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -85,7 +85,6 @@ public:
void set_sink(SharedPtr<MIDISink> sink);
private:
-
// Audio context
SharedPtr<Node> earliest_node() const;
bool enter_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node> node, SharedPtr<UpdateBuffer> updates);
@@ -94,12 +93,12 @@ private:
static const size_t MAX_ACTIVE_NODES = 128;
std::vector< SharedPtr<Node> > _active_nodes;
- bool _is_activated;
- bool _is_finished;
- Raul::TimeStamp _time;
SharedPtr<LearnRequest> _pending_learn;
WeakPtr<MIDISink> _sink;
Nodes _nodes;
+ Raul::TimeStamp _time;
+ bool _is_activated;
+ bool _is_finished;
};
} // namespace Machina