2 files changed, 90 insertions, 5 deletions
diff --git a/src/libs/engine/CompiledPatch.hpp b/src/libs/engine/CompiledPatch.hpp
new file mode 100644
index 00000000..9ab252b3
--- /dev/null
+++ b/src/libs/engine/CompiledPatch.hpp
@@ -0,0 +1,84 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ * 
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef COMPILED_PATCH_HPP
+#define COMPILED_PATCH_HPP
+
+#include <iostream>
+#include <vector>
+#include <raul/List.hpp>
+#include <raul/Deletable.hpp>
+#include <boost/utility.hpp>
+
+using Raul::List;
+
+using namespace std;
+
+namespace Ingen {
+
+
+/** A node, and it's providers/dependants.
+ *
+ * This is all the information required to execute a node in a process thread.
+ */
+struct CompiledNode {
+	CompiledNode(Node* n, size_t np, List<Node*>* d)
+		: _node(n), _n_providers(np)
+	{
+		// Copy to a vector for maximum iteration speed and cache optimization
+		// (Need to take a copy anyway)
+
+		for (List<Node*>::iterator i = d->begin(); i != d->end(); ++i)
+			_dependants.push_back(*i);
+	}
+
+	Node*                node()        const { return _node; }
+	size_t               n_providers() const { return _n_providers; }
+	const vector<Node*>& dependants()  const { return _dependants; }
+
+private:
+	Node*         _node;
+	size_t        _n_providers; ///< Number of input ready signals to trigger run
+	vector<Node*> _dependants; ///< Nodes this one's output ports are connected to
+};
+
+
+/** A patch and a set of connections, "compiled" into a flat structure with
+ * the correct order so the audio thread(s) can execute it without
+ * threading problems (since the preprocessor thread fiddles with other
+ * things).
+ *
+ * Currently objects still have some 'heavyweight' connection state, but
+ * eventually this should be the only place a particular set of connections
+ * in a patch is stored, so various "connection presets" can be switched
+ * in a realtime safe way.
+ *
+ * The nodes contained here are sorted in the order they must be executed.
+ * The parallel processing algorithm guarantees no node will be executed
+ * before it's providers, using this order as well as semaphores.
+ */
+struct CompiledPatch : public std::vector<CompiledNode>
+                     , public Raul::Deletable
+                     , public boost::noncopyable {
+	/*CompiledPatch() : std::vector<CompiledNode>() {}
+	CompiledPatch(size_t reserve) : std::vector<CompiledNode>(reserve) {}*/
+};
+
+
+} // namespace Ingen
+
+#endif // COMPILED_PATCH_HPP
diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp
index f904ce2a..f79ccfd1 100644
--- a/src/libs/engine/Engine.cpp
+++ b/src/libs/engine/Engine.cpp
@@ -75,11 +75,6 @@ Engine::Engine(Ingen::Shared::World* world)
 Engine::~Engine()
 {
 	deactivate();
-	
-	for (size_t i=0; i < _process_slaves.size(); ++i)
-		delete _process_slaves[i];
-	
-	_process_slaves.clear();
 
 	for (ObjectStore::Objects::const_iterator i = _object_store->objects().begin();
 			i != _object_store->objects().end(); ++i) {
@@ -267,6 +262,12 @@ Engine::deactivate()
 	_audio_driver->deactivate();
 
 	_audio_driver->root_patch()->deactivate();
+	
+	for (size_t i=0; i < _process_slaves.size(); ++i) {
+		delete _process_slaves[i];
+	}
+	
+	_process_slaves.clear();
 
 	// Finalize any lingering events (unlikely)
 	//_post_processor->whip();