diff options
| author | David Robillard <d@drobilla.net> | 2012-08-14 21:37:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-08-14 21:37:20 +0000 |
| commit | 76b602f1f834cb2c255848c5ba887b3d7c47171a (patch) | |
| tree | cbe6588c70f2df4384231d9cbdfd06fb0aa7e45f /ingen/client | |
| parent | a8312be2d849b73ff0acc80a226095bcfee3556c (diff) | |
| download | ingen-76b602f1f834cb2c255848c5ba887b3d7c47171a.tar.gz ingen-76b602f1f834cb2c255848c5ba887b3d7c47171a.tar.bz2 ingen-76b602f1f834cb2c255848c5ba887b3d7c47171a.zip | |
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
Diffstat (limited to 'ingen/client')
| -rw-r--r-- | ingen/client/ClientStore.hpp | 6 | ||||
| -rw-r--r-- | ingen/client/NodeModel.hpp | 2 |
2 files changed, 2 insertions, 6 deletions
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<Raul::URI, SharedPtr<PluginModel> > Plugins; + typedef std::map< const Raul::URI, SharedPtr<PluginModel> > Plugins; SharedPtr<const Plugins> plugins() const { return _plugins; } SharedPtr<Plugins> plugins() { return _plugins; } void set_plugins(SharedPtr<Plugins> p) { _plugins = p; } @@ -109,8 +107,6 @@ public: INGEN_SIGNAL(new_plugin, void, SharedPtr<PluginModel>); private: - void add(GraphObject* o) { throw; } - SharedPtr<ObjectModel> _object(const Raul::Path& path); SharedPtr<PluginModel> _plugin(const Raul::URI& uri); SharedPtr<Resource> _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<PluginModel> _plugin; ///< The plugin this node is an instance of |