From 19928bb583e72802746b89e322f71ecc0fcb7427 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 May 2009 04:05:32 +0000 Subject: The great ID refactoring of 2009. Path is now actually URI (scheme path: for now). Therefore ingen nodes and such live in the same namespace as ... well, everything. Including plugins. Thar be profit, laddies. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1992 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/NodeModel.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/client/NodeModel.hpp') diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index 1cf7233a..cc9811fd 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -54,7 +54,7 @@ public: Shared::Port* port(uint32_t index) const; - const std::string& plugin_uri() const { return _plugin_uri; } + const Raul::URI& plugin_uri() const { return _plugin_uri; } const Shared::Plugin* plugin() const { return _plugin.get(); } uint32_t num_ports() const { return _ports.size(); } const Ports& ports() const { return _ports; } @@ -68,15 +68,15 @@ public: protected: friend class ClientStore; - NodeModel(const std::string& plugin_uri, const Path& path); - NodeModel(SharedPtr plugin, const Path& path); + NodeModel(const Raul::URI& plugin_uri, const Raul::Path& path); + NodeModel(SharedPtr plugin, const Raul::Path& path); - NodeModel(const Path& path); + NodeModel(const Raul::Path& path); void add_child(SharedPtr c); bool remove_child(SharedPtr c); void add_port(SharedPtr pm); void remove_port(SharedPtr pm); - void remove_port(const Path& port_path); + void remove_port(const Raul::Path& port_path); void add_program(int bank, int program, const std::string& name); void remove_program(int bank, int program); void set(SharedPtr model); @@ -84,7 +84,7 @@ protected: virtual void clear(); Ports _ports; ///< Vector of ports (not a Table to preserve order) - std::string _plugin_uri; ///< Plugin URI (if PluginModel is unknown) + Raul::URI _plugin_uri; ///< Plugin URI (if PluginModel is unknown) SharedPtr _plugin; ///< The plugin this node is an instance of private: -- cgit v1.2.1