5 files changed, 159 insertions, 4 deletions
diff --git a/src/libs/client/Store.hpp b/src/libs/client/ClientStore.cpp
index f86c511a..24c23f14 100644
--- a/src/libs/client/Store.hpp
+++ b/src/libs/client/ClientStore.cpp
@@ -28,7 +28,7 @@
 #include <raul/PathTable.hpp>
 #include <raul/TableImpl.hpp>
 #include "interface/EngineInterface.hpp"
-#include "interface/Store.hpp"
+#include "shared/Store.hpp"
 using std::string; using std::list;
 using Ingen::Shared::EngineInterface;
 using Raul::Path;
diff --git a/src/libs/client/ClientStore.hpp b/src/libs/client/ClientStore.hpp
new file mode 100644
index 00000000..24c23f14
--- /dev/null
+++ b/src/libs/client/ClientStore.hpp
@@ -0,0 +1,155 @@
+/* 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 STORE_H
+#define STORE_H
+
+#include <cassert>
+#include <string>
+#include <list>
+#include <raul/SharedPtr.hpp>
+#include <sigc++/sigc++.h>
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
+#include <raul/PathTable.hpp>
+#include <raul/TableImpl.hpp>
+#include "interface/EngineInterface.hpp"
+#include "shared/Store.hpp"
+using std::string; using std::list;
+using Ingen::Shared::EngineInterface;
+using Raul::Path;
+using Raul::Atom;
+
+namespace Ingen {
+
+namespace Shared { class GraphObject; }
+
+namespace Client {
+
+class SigClientInterface;
+class ObjectModel;
+class PluginModel;
+class PatchModel;
+class NodeModel;
+class PortModel;
+class ConnectionModel;
+
+
+/** Automatically manages models of objects in the engine.
+ *
+ * \ingroup IngenClient
+ */
+class ClientStore : public Shared::Store, public sigc::trackable { // FIXME: is trackable necessary?
+public:
+	ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientInterface> emitter);
+
+	SharedPtr<PluginModel> plugin(const string& uri);
+	SharedPtr<ObjectModel> object(const Path& path);
+
+	void clear();
+
+	size_t num_object() { return _objects.size(); }
+	
+	Objects::iterator find(const Path& path) { return _objects.find(path); }
+	
+	typedef Raul::Table<string, SharedPtr<PluginModel> > Plugins;
+	const Plugins& plugins() const { return _plugins; }
+
+	typedef Raul::PathTable< SharedPtr<Shared::GraphObject> > Objects;
+	const Objects& objects() const { return _objects; }
+	Objects& objects() { return _objects; }
+
+	Objects::const_iterator children_begin(SharedPtr<Shared::GraphObject> o) const;
+	Objects::const_iterator children_end(SharedPtr<Shared::GraphObject> o) const;
+
+	SharedPtr<Shared::GraphObject> find_child(SharedPtr<Shared::GraphObject> parent,
+	                                          const string& child_name) const;
+
+	sigc::signal<void, SharedPtr<ObjectModel> > signal_new_object; 
+	sigc::signal<void, SharedPtr<PluginModel> > signal_new_plugin; 
+
+private:
+
+	void add(Shared::GraphObject* o) { throw; }
+
+	void add_object(SharedPtr<ObjectModel> object);
+	SharedPtr<ObjectModel> remove_object(const Path& path);
+	
+	void add_plugin(SharedPtr<PluginModel> plugin);
+
+	SharedPtr<PatchModel> connection_patch(const Path& src_port_path, const Path& dst_port_path);
+
+	// It would be nice to integrate these somehow..
+	
+	void add_orphan(SharedPtr<ObjectModel> orphan);
+	void resolve_orphans(SharedPtr<ObjectModel> parent);
+	
+	void add_connection_orphan(std::pair<Path, Path> orphan);
+	void resolve_connection_orphans(SharedPtr<PortModel> port);
+	
+	void add_plugin_orphan(SharedPtr<NodeModel> orphan);
+	void resolve_plugin_orphans(SharedPtr<PluginModel> plugin);
+	
+	void add_variable_orphan(const Path& subject, const string& predicate, const Atom& value);
+	void resolve_variable_orphans(SharedPtr<ObjectModel> subject);
+
+	// Slots for SigClientInterface signals
+	void destruction_event(const Path& path);
+	void rename_event(const Path& old_path, const Path& new_path);
+	void new_plugin_event(const string& uri, const string& type_uri, const string& symbol, const string& name);
+	void new_patch_event(const Path& path, uint32_t poly);
+	void new_node_event(const string& plugin_uri, const Path& node_path, bool is_polyphonic, uint32_t num_ports);
+	void new_port_event(const Path& path, uint32_t index, const string& data_type, bool is_output);
+	void polyphonic_event(const Path& path, bool polyphonic);
+	void patch_enabled_event(const Path& path);
+	void patch_disabled_event(const Path& path);
+	void patch_polyphony_event(const Path& path, uint32_t poly);
+	void patch_cleared_event(const Path& path);
+	void variable_change_event(const Path& subject_path, const string& predicate, const Atom& value);
+	void control_change_event(const Path& port_path, float value);
+	void port_activity_event(const Path& port_path);
+	void connection_event(const Path& src_port_path, const Path& dst_port_path);
+	void disconnection_event(const Path& src_port_path, const Path& dst_port_path);
+	
+	bool attempt_connection(const Path& src_port_path, const Path& dst_port_path, bool add_orphan=false);
+	
+	SharedPtr<EngineInterface>    _engine;
+	SharedPtr<SigClientInterface> _emitter;
+
+	Objects _objects; ///< Map, keyed by Ingen path
+	Plugins _plugins; ///< Map, keyed by plugin URI
+
+	/** Objects we've received, but depend on the existance of another unknown object.
+	 * Keyed by the path of the depended-on object (for tolerance of orderless comms) */
+	Raul::PathTable<list<SharedPtr<ObjectModel> > > _orphans;
+	
+	/** Same idea, except with plugins instead of parents.
+	 * It's unfortunate everything doesn't just have a URI and this was the same.. ahem.. */
+	Raul::Table<string, list<SharedPtr<NodeModel> > > _plugin_orphans;
+	
+	/** Not orphans OF variable like the above, but orphans which are variable */
+	Raul::PathTable<list<std::pair<string, Atom> > > _variable_orphans;
+	
+	/** Ditto */
+	list<std::pair<Path, Path> > _connection_orphans;
+};
+
+
+} // namespace Client
+} // namespace Ingen
+
+#endif // STORE_H
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index f111a54d..7047ce62 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -49,8 +49,8 @@ libingen_client_la_SOURCES = \
 	PortModel.cpp \
 	PortModel.hpp \
 	SigClientInterface.hpp \
-	Store.cpp \
-	Store.hpp \
+	ClientStore.cpp \
+	ClientStore.hpp \
 	ThreadedSigClientInterface.cpp \
 	ThreadedSigClientInterface.hpp \
 	client.cpp \
diff --git a/src/libs/client/ObjectModel.hpp b/src/libs/client/ObjectModel.hpp
index f052f1d9..dbd188a3 100644
--- a/src/libs/client/ObjectModel.hpp
+++ b/src/libs/client/ObjectModel.hpp
@@ -30,7 +30,6 @@
 #include <raul/SharedPtr.hpp>
 #include <raul/PathTable.hpp>
 #include "interface/GraphObject.hpp"
-#include "Store.hpp"
 
 using Raul::PathTable;
 using std::string;
diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp
index 7f928b41..360707d3 100644
--- a/src/libs/client/PatchModel.cpp
+++ b/src/libs/client/PatchModel.cpp
@@ -18,6 +18,7 @@
 #include "PatchModel.hpp"
 #include "NodeModel.hpp"
 #include "ConnectionModel.hpp"
+#include "ClientStore.hpp"
 #include <cassert>
 #include <iostream>