aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/Machine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/Machine.cpp')
-rw-r--r--src/engine/Machine.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp
index 11d894c..7f668ef 100644
--- a/src/engine/Machine.cpp
+++ b/src/engine/Machine.cpp
@@ -76,7 +76,7 @@ Machine::remove_node(SharedPtr<Node> node)
/** Exit all active states and reset time to 0.
*/
void
-Machine::reset()
+Machine::reset(Raul::BeatTime time)
{
for (size_t i=0; i < MAX_ACTIVE_NODES; ++i) {
_active_nodes[i].reset();
@@ -87,7 +87,7 @@ Machine::reset()
const SharedPtr<Node> node = (*n);
if (node->is_active())
- node->exit(_sink.lock(), _time);
+ node->exit(_sink.lock(), time);
assert(! node->is_active());
}
@@ -216,10 +216,8 @@ Machine::exit_node(SharedPtr<Raul::MIDISink> sink, const SharedPtr<Node> node)
BeatCount
Machine::run(const Raul::TimeSlice& time)
{
- using namespace std;
- if (_is_finished) {
+ if (_is_finished)
return 0;
- }
const SharedPtr<Raul::MIDISink> sink = _sink.lock();