diff options
author | David Robillard <d@drobilla.net> | 2011-04-18 12:47:15 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-18 12:47:15 +0000 |
commit | 8ba6bb943889bfdd58cf4a971a152041c1199cfe (patch) | |
tree | 91fbe8577e6d01070aa81f532ddd8102db1476f5 /src/client/ThreadedSigClientInterface.hpp | |
parent | 3cd3bfe5079f84fafb7dc217f5393d6ba947109c (diff) | |
download | ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.gz ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.bz2 ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.zip |
Put engine code in new Ingen::Engine namespace.
Put core interfaces in Ingen namespace (not Ingen::Shared).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3159 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/ThreadedSigClientInterface.hpp')
-rw-r--r-- | src/client/ThreadedSigClientInterface.hpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index 0f8843a7..e7dc336d 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -31,7 +31,9 @@ typedef sigc::slot<void> Closure; namespace Ingen { -namespace Shared { class EngineInterface; } + +class EngineInterface; + namespace Client { /** A LibSigC++ signal emitting interface for clients to use. @@ -82,14 +84,14 @@ public: void error(const std::string& msg) { push_sig(sigc::bind(error_slot, msg)); } - void put(const Raul::URI& path, - const Shared::Resource::Properties& properties, - Shared::Resource::Graph ctx=Shared::Resource::DEFAULT) + void put(const Raul::URI& path, + const Resource::Properties& properties, + Resource::Graph ctx=Resource::DEFAULT) { push_sig(sigc::bind(put_slot, path, properties, ctx)); } - void delta(const Raul::URI& path, - const Shared::Resource::Properties& remove, - const Shared::Resource::Properties& add) + void delta(const Raul::URI& path, + const Resource::Properties& remove, + const Resource::Properties& add) { push_sig(sigc::bind(delta_slot, path, remove, add)); } void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) @@ -128,10 +130,10 @@ private: sigc::slot<void, std::string> error_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Symbol> new_plugin_slot; sigc::slot<void, Raul::Path, Raul::URI, uint32_t, bool> new_port_slot; - sigc::slot<void, Raul::URI, Shared::Resource::Properties, - Shared::Resource::Graph> put_slot; - sigc::slot<void, Raul::URI, Shared::Resource::Properties, - Shared::Resource::Properties> delta_slot; + sigc::slot<void, Raul::URI, Resource::Properties, + Resource::Graph> put_slot; + sigc::slot<void, Raul::URI, Resource::Properties, + Resource::Properties> delta_slot; sigc::slot<void, Raul::Path, Raul::Path> connection_slot; sigc::slot<void, Raul::Path> object_deleted_slot; sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot; |