Move MIDISink from Machine state to Context parameter.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4925 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 14 insertions, 29 deletions

diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp
index 9538be2..8a7f0b4 100644
--- a/src/engine/Machine.cpp
+++ b/src/engine/Machine.cpp
@@ -54,10 +54,9 @@ Machine::Machine(TimeUnit unit)
 Machine::Machine(const Machine& copy)
 	: Stateful() // don't copy RDF ID
 	, _active_nodes(MAX_ACTIVE_NODES, SharedPtr<Node>())
+	, _time(copy.time())
 	, _is_activated(false)
 	, _is_finished(false)
-	, _time(copy.time())
-	, _sink(copy._sink)
 {
 	std::map< SharedPtr<Node>, SharedPtr<Node> > replacements;
 
@@ -84,7 +83,6 @@ Machine::operator=(const Machine& other)
 	_is_finished = false;
 	_time = other._time;
 	_pending_learn = SharedPtr<LearnRequest>();
-	_sink = other._sink;
 	_nodes.clear();
 
 	map< SharedPtr<Node>, SharedPtr<Node> > replacements;
@@ -106,17 +104,6 @@ Machine::operator=(const Machine& other)
 	return *this;
 }
 
-/** Set the MIDI sink to be used for executing MIDI actions.
- *
- * MIDI actions will silently do nothing unless this call is passed an
- * existing MIDISink before running.
- */
-void
-Machine::set_sink(SharedPtr<MIDISink> sink)
-{
-	_sink = sink;
-}
-
 /** Always returns a node, unless there are none */
 SharedPtr<Node>
 Machine::random_node()
@@ -165,16 +152,16 @@ Machine::remove_node(SharedPtr<Node> node)
 /** Exit all active states and reset time to 0.
  */
 void
-Machine::reset(Raul::TimeStamp time)
+Machine::reset(MIDISink* sink, Raul::TimeStamp time)
 {
 	if (!_is_finished) {
 		for (Nodes::const_iterator n = _nodes.begin(); n != _nodes.end(); ++n) {
 			SharedPtr<Node> node = (*n);
 
-			if (node->is_active())
-				node->exit(_sink.lock(), time);
+			if (sink && node->is_active())
+				node->exit(sink, time);
 
-			assert(! node->is_active());
+			assert(!node->is_active());
 		}
 
 		for (size_t i=0; i < MAX_ACTIVE_NODES; ++i)
@@ -211,7 +198,7 @@ Machine::earliest_node() const
  * Returns true if node was entered, or false if the maximum active nodes has been reached.
  */
 bool
-Machine::enter_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node> node, SharedPtr<UpdateBuffer> updates)
+Machine::enter_node(Context& context, SharedPtr<Node> node, SharedPtr<UpdateBuffer> updates)
 {
 	assert(!node->is_active());
 
@@ -220,7 +207,7 @@ Machine::enter_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node>
 	size_t index = (rand() % MAX_ACTIVE_NODES);
 	for (size_t i=0; i < MAX_ACTIVE_NODES; ++i) {
 		if (_active_nodes.at(index) == NULL) {
-			node->enter(sink, _time);
+			node->enter(context.sink(), _time);
 			assert(node->is_active());
 			_active_nodes.at(index) = node;
 
@@ -240,9 +227,9 @@ Machine::enter_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node>
 /** Exit an active node at the current _time.
  */
 void
-Machine::exit_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node> node, SharedPtr<UpdateBuffer> updates)
+Machine::exit_node(Context& context, SharedPtr<Node> node, SharedPtr<UpdateBuffer> updates)
 {
-	node->exit(sink, _time);
+	node->exit(context.sink(), _time);
 	write_set(updates,
 	          node->id(),
 	          URIs::instance().machina_active,
@@ -269,7 +256,7 @@ Machine::exit_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node> n
 					&& rand_normal > range_min
 					&& rand_normal < range_min + (*s)->probability()) {
 
-				enter_node(context, sink, (*s)->head(), updates);
+				enter_node(context, (*s)->head(), updates);
 				break;
 
 			} else {
@@ -288,7 +275,7 @@ Machine::exit_node(Context& context, SharedPtr<MIDISink> sink, SharedPtr<Node> n
 				SharedPtr<Node> head = (*e)->head();
 
 				if ( ! head->is_active())
-					enter_node(context, sink, head, updates);
+					enter_node(context, head, updates);
 			}
 		}
 
@@ -310,8 +297,6 @@ Machine::run(Context& context, SharedPtr<UpdateBuffer> updates)
 	if (_is_finished)
 		return 0;
 
-	SharedPtr<MIDISink> sink = _sink.lock();
-
 	const TimeStamp cycle_end_frames = context.time().start_ticks() + context.time().length_ticks();
 	const TimeStamp cycle_end = context.time().ticks_to_beats(cycle_end_frames);
 
@@ -323,7 +308,7 @@ Machine::run(Context& context, SharedPtr<UpdateBuffer> updates)
 		if ( ! _nodes.empty()) {
 			for (Nodes::const_iterator n = _nodes.begin(); n != _nodes.end(); ++n) {
 				if ((*n)->is_active()) {
-					(*n)->exit(sink, _time);
+					(*n)->exit(context.sink(), _time);
 					write_set(updates,
 					          (*n)->id(),
 					          URIs::instance().machina_active,
@@ -331,7 +316,7 @@ Machine::run(Context& context, SharedPtr<UpdateBuffer> updates)
 				}
 
 				if ((*n)->is_initial()) {
-					if (enter_node(context, sink, (*n), updates))
+					if (enter_node(context, (*n), updates))
 						entered = true;
 				}
 			}
@@ -358,7 +343,7 @@ Machine::run(Context& context, SharedPtr<UpdateBuffer> updates)
 		} else if (context.time().beats_to_ticks(earliest->exit_time()) < cycle_end_frames) {
 			// Earliest active state ends this cycle
 			_time = earliest->exit_time();
-			exit_node(context, sink, earliest, updates);
+			exit_node(context, earliest, updates);
 
 		} else {
 			// Earliest active state ends in the future, done this cycle