From 76b602f1f834cb2c255848c5ba887b3d7c47171a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 14 Aug 2012 21:37:20 +0000 Subject: Replace use of old Raul Table stuff with std::map. Move most Store functionality into Ingen::Store and eliminate EngineStore. Much cleaner delete and move implementations. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4696 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/client/ClientStore.hpp | 6 +----- ingen/client/NodeModel.hpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'ingen/client') diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 3762dcb0..cfa9df12 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -25,9 +25,7 @@ #include "ingen/client/signal.hpp" #include "ingen/Store.hpp" #include "raul/Path.hpp" -#include "raul/PathTable.hpp" #include "raul/SharedPtr.hpp" -#include "raul/TableImpl.hpp" namespace Raul { class Atom; } @@ -67,7 +65,7 @@ public: void clear(); - typedef Raul::Table > Plugins; + typedef std::map< const Raul::URI, SharedPtr > Plugins; SharedPtr plugins() const { return _plugins; } SharedPtr plugins() { return _plugins; } void set_plugins(SharedPtr p) { _plugins = p; } @@ -109,8 +107,6 @@ public: INGEN_SIGNAL(new_plugin, void, SharedPtr); private: - void add(GraphObject* o) { throw; } - SharedPtr _object(const Raul::Path& path); SharedPtr _plugin(const Raul::URI& uri); SharedPtr _resource(const Raul::URI& uri); diff --git a/ingen/client/NodeModel.hpp b/ingen/client/NodeModel.hpp index 93a512f0..9f2fab6e 100644 --- a/ingen/client/NodeModel.hpp +++ b/ingen/client/NodeModel.hpp @@ -96,7 +96,7 @@ protected: virtual void clear(); - Ports _ports; ///< Vector of ports (not a Table to preserve order) + Ports _ports; ///< Vector of ports Raul::URI _plugin_uri; ///< Plugin URI (if PluginModel is unknown) SharedPtr _plugin; ///< The plugin this node is an instance of -- cgit v1.2.1