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

22 files changed, 133 insertions, 123 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 7f3f78e0..32e115e6 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -43,7 +43,7 @@ using namespace Shared;
 namespace Client {
 
 ClientStore::ClientStore(SharedPtr<Shared::LV2URIMap>       uris,
-                         SharedPtr<Shared::EngineInterface> engine,
+                         SharedPtr<EngineInterface> engine,
                          SharedPtr<SigClientInterface>      emitter)
 	: _uris(uris)
 	, _engine(engine)
@@ -101,7 +101,7 @@ ClientStore::add_object(SharedPtr<ObjectModel> object)
 
 	}
 
-	typedef Shared::Resource::Properties::const_iterator Iterator;
+	typedef Resource::Properties::const_iterator Iterator;
 	for (Iterator i = object->properties().begin();
 	     i != object->properties().end(); ++i)
 		object->signal_property(i->first, i->second);
@@ -177,7 +177,7 @@ ClientStore::object(const Path& path)
 	}
 }
 
-SharedPtr<Shared::Resource>
+SharedPtr<Resource>
 ClientStore::resource(const URI& uri)
 {
 	if (Path::is_path(uri))
@@ -220,14 +220,14 @@ ClientStore::move(const Path& old_path_str, const Path& new_path_str)
 		return;
 	}
 
-	typedef Table<Path, SharedPtr<Shared::GraphObject> > Removed;
+	typedef Table<Path, SharedPtr<GraphObject> > Removed;
 
 	iterator           end     = find_descendants_end(parent);
 	SharedPtr<Removed> removed = yank(parent, end);
 
 	assert(removed->size() > 0);
 
-	typedef Table<Path, SharedPtr<Shared::GraphObject> > PathTable;
+	typedef Table<Path, SharedPtr<GraphObject> > PathTable;
 	for (PathTable::iterator i = removed->begin(); i != removed->end(); ++i) {
 		const Path& child_old_path = i->first;
 		assert(Path::descendant_comparator(old_path, child_old_path));
@@ -247,9 +247,9 @@ ClientStore::move(const Path& old_path_str, const Path& new_path_str)
 }
 
 void
-ClientStore::put(const URI&                          uri,
-                 const Shared::Resource::Properties& properties,
-                 Shared::Resource::Graph             ctx)
+ClientStore::put(const URI&                  uri,
+                 const Resource::Properties& properties,
+                 Resource::Graph             ctx)
 {
 	typedef Resource::Properties::const_iterator Iterator;
 #ifdef INGEN_CLIENT_STORE_DUMP
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index bb74a27b..7bc21b99 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -36,7 +36,7 @@ namespace Raul { class Atom; }
 
 namespace Ingen {
 
-namespace Shared { class GraphObject; }
+class GraphObject;
 
 namespace Client {
 
@@ -52,17 +52,17 @@ class SigClientInterface;
  * \ingroup IngenClient
  */
 class ClientStore : public Shared::Store
-                  , public Shared::CommonInterface
+                  , public CommonInterface
                   , public sigc::trackable {
 public:
 	ClientStore(
-		SharedPtr<Shared::LV2URIMap>       uris,
-		SharedPtr<Shared::EngineInterface> engine=SharedPtr<Shared::EngineInterface>(),
-		SharedPtr<SigClientInterface>      emitter=SharedPtr<SigClientInterface>());
+		SharedPtr<Shared::LV2URIMap>  uris,
+		SharedPtr<EngineInterface>    engine=SharedPtr<EngineInterface>(),
+		SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
 
-	SharedPtr<PluginModel>      plugin(const Raul::URI& uri);
-	SharedPtr<ObjectModel>      object(const Raul::Path& path);
-	SharedPtr<Shared::Resource> resource(const Raul::URI& uri);
+	SharedPtr<PluginModel>  plugin(const Raul::URI& uri);
+	SharedPtr<ObjectModel>  object(const Raul::Path& path);
+	SharedPtr<Resource>     resource(const Raul::URI& uri);
 
 	void clear();
 
@@ -74,15 +74,15 @@ public:
 	Shared::LV2URIMap& uris() { return *_uris.get(); }
 
 	// CommonInterface
-	bool new_object(const Shared::GraphObject* object);
+	bool new_object(const GraphObject* object);
 
-	void put(const Raul::URI&                    uri,
-	         const Shared::Resource::Properties& properties,
-	         Shared::Resource::Graph             ctx=Shared::Resource::DEFAULT);
+	void put(const Raul::URI&            uri,
+	         const Resource::Properties& properties,
+	         Resource::Graph             ctx=Resource::DEFAULT);
 
-	void delta(const Raul::URI&                    uri,
-	           const Shared::Resource::Properties& remove,
-	           const Shared::Resource::Properties& add);
+	void delta(const Raul::URI&            uri,
+	           const Resource::Properties& remove,
+	           const Resource::Properties& add);
 
 	void move(const Raul::Path& old_path,
 	          const Raul::Path& new_path);
@@ -103,7 +103,7 @@ public:
 	sigc::signal< void, SharedPtr<PluginModel> > signal_new_plugin;
 
 private:
-	void add(Shared::GraphObject* o) { throw; }
+	void add(GraphObject* o) { throw; }
 
 	void add_object(SharedPtr<ObjectModel> object);
 	SharedPtr<ObjectModel> remove_object(const Raul::Path& path);
@@ -123,9 +123,9 @@ private:
 	bool attempt_connection(const Raul::Path& src_port_path,
 	                        const Raul::Path& dst_port_path);
 
-	SharedPtr<Shared::LV2URIMap>       _uris;
-	SharedPtr<Shared::EngineInterface> _engine;
-	SharedPtr<SigClientInterface>      _emitter;
+	SharedPtr<Shared::LV2URIMap>  _uris;
+	SharedPtr<EngineInterface>    _engine;
+	SharedPtr<SigClientInterface> _emitter;
 
 	SharedPtr<Plugins> _plugins; ///< Map, keyed by plugin URI
 };
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index f05298c4..bc2f56e5 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -41,7 +41,7 @@ class ClientStore;
  *
  * \ingroup IngenClient
  */
-class ConnectionModel : public Shared::Connection
+class ConnectionModel : public Connection
 {
 public:
 	SharedPtr<PortModel> src_port() const { return _src_port; }
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index 76a44bea..d0c4fb73 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -46,9 +46,9 @@ static SoupSession*        client_session  = NULL;
 static HTTPClientReceiver* client_receiver = NULL;
 
 HTTPClientReceiver::HTTPClientReceiver(
-		Shared::World*                     world,
-		const std::string&                 url,
-		SharedPtr<Shared::ClientInterface> target)
+		Shared::World*             world,
+		const std::string&         url,
+		SharedPtr<ClientInterface> target)
 	: _target(target)
 	, _world(world)
 	, _url(url)
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index c6df3dd7..2ad1ab19 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -37,9 +37,9 @@ namespace Client {
 class HTTPClientReceiver : public boost::noncopyable, public Raul::Deletable
 {
 public:
-	HTTPClientReceiver(Shared::World*                     world,
-	                   const std::string&                 url,
-	                   SharedPtr<Shared::ClientInterface> target);
+	HTTPClientReceiver(Shared::World*             world,
+	                   const std::string&         url,
+	                   SharedPtr<ClientInterface> target);
 
 	~HTTPClientReceiver();
 
@@ -70,8 +70,8 @@ private:
 	friend class Listener;
 	SharedPtr<Listener> _listener;
 
-	Glib::Mutex _mutex;
-	SharedPtr<Shared::ClientInterface> _target;
+	Glib::Mutex                _mutex;
+	SharedPtr<ClientInterface> _target;
 
 	Shared::World*    _world;
 	const std::string _url;
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index bbb0f28a..144bf37b 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -31,7 +31,9 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
+
 using namespace Shared;
+
 namespace Client {
 
 HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url)
@@ -104,7 +106,7 @@ HTTPEngineSender::quit()
 void
 HTTPEngineSender::put(const URI&                  uri,
                       const Resource::Properties& properties,
-                      Shared::Resource::Graph     ctx)
+                      Resource::Graph     ctx)
 {
 	const string path     = (uri.substr(0, 6) == "path:/") ? uri.substr(6) : uri.str();
 	const string full_uri = _engine_url.str() + "/" + path;
@@ -123,9 +125,9 @@ HTTPEngineSender::put(const URI&                  uri,
 }
 
 void
-HTTPEngineSender::delta(const Raul::URI&                    path,
-	                    const Shared::Resource::Properties& remove,
-	                    const Shared::Resource::Properties& add)
+HTTPEngineSender::delta(const Raul::URI&            path,
+	                    const Resource::Properties& remove,
+	                    const Resource::Properties& add)
 {
 	warn << "FIXME: HTTP DELTA" << endl;
 }
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 58cdf407..e12815b1 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -44,7 +44,7 @@ class HTTPClientReceiver;
  *
  * \ingroup IngenClient
  */
-class HTTPEngineSender : public Shared::EngineInterface
+class HTTPEngineSender : public EngineInterface
 {
 public:
 	HTTPEngineSender(Shared::World* world, const Raul::URI& engine_url);
@@ -72,7 +72,7 @@ public:
 	void transfer_end()   {}
 
 	// Client registration
-	void register_client(Shared::ClientInterface* client);
+	void register_client(ClientInterface* client);
 	void unregister_client(const Raul::URI& uri);
 
 	// Engine commands
@@ -83,13 +83,13 @@ public:
 
 	// Object commands
 
-	virtual void put(const Raul::URI&                    path,
-	                 const Shared::Resource::Properties& properties,
-	                 Shared::Resource::Graph             ctx=Shared::Resource::DEFAULT);
+	virtual void put(const Raul::URI&            path,
+	                 const Resource::Properties& properties,
+	                 Resource::Graph             ctx=Resource::DEFAULT);
 
-	virtual void delta(const Raul::URI&                    path,
-	                   const Shared::Resource::Properties& remove,
-	                   const Shared::Resource::Properties& add);
+	virtual void delta(const Raul::URI&            path,
+	                   const Resource::Properties& remove,
+	                   const Resource::Properties& add);
 
 	virtual void del(const Raul::Path& path);
 
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 51016f03..34c70765 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -154,11 +154,11 @@ NodeModel::get_port(const Raul::Symbol& symbol) const
 	return SharedPtr<PortModel>();
 }
 
-Shared::Port*
+Ingen::Port*
 NodeModel::port(uint32_t index) const
 {
 	assert(index < num_ports());
-	return dynamic_cast<Shared::Port*>(_ports[index].get());
+	return dynamic_cast<Ingen::Port*>(_ports[index].get());
 }
 
 void
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index e283323a..2a47bc04 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -44,7 +44,8 @@ class ClientStore;
  *
  * \ingroup IngenClient
  */
-class NodeModel : public ObjectModel, virtual public Ingen::Shared::Node
+class NodeModel : public ObjectModel,
+                  virtual public Ingen::Node
 {
 public:
 	NodeModel(const NodeModel& copy);
@@ -54,11 +55,11 @@ public:
 
 	SharedPtr<PortModel> get_port(const Raul::Symbol& symbol) const;
 
-	Shared::Port* port(uint32_t index) const;
+	Port* port(uint32_t index) const;
 
 	const Raul::URI&       plugin_uri()   const { return _plugin_uri; }
-	const Shared::Plugin*  plugin()       const { return _plugin.get(); }
-	Shared::Plugin*        plugin()             { return _plugin.get(); }
+	const Plugin*          plugin()       const { return _plugin.get(); }
+	Plugin*                plugin()             { return _plugin.get(); }
 	SharedPtr<PluginModel> plugin_model() const { return _plugin; }
 	uint32_t               num_ports()    const { return _ports.size(); }
 	const Ports&           ports()        const { return _ports; }
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index 7a68692f..36661e70 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -36,9 +36,8 @@ using namespace Raul;
 namespace Ingen {
 namespace Client {
 
-using namespace Shared;
-
-OSCClientReceiver::OSCClientReceiver(int listen_port, SharedPtr<Shared::ClientInterface> target)
+OSCClientReceiver::OSCClientReceiver(int                        listen_port,
+                                     SharedPtr<ClientInterface> target)
 	: _target(target)
 	, _listen_port(listen_port)
 	, _st(NULL)
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index d9230e2a..9f256c15 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -54,7 +54,7 @@ inline static int name##_cb(LO_HANDLER_ARGS, void* osc_listener)\
 class OSCClientReceiver : public boost::noncopyable, public Raul::Deletable
 {
 public:
-	OSCClientReceiver(int listen_port, SharedPtr<Shared::ClientInterface> target);
+	OSCClientReceiver(int listen_port, SharedPtr<ClientInterface> target);
 	~OSCClientReceiver();
 
 	std::string uri() const { return lo_server_thread_get_url(_st); }
@@ -73,7 +73,7 @@ private:
 	static int  generic_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data);
 	static int  unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* osc_receiver);
 
-	SharedPtr<Shared::ClientInterface> _target;
+	SharedPtr<ClientInterface> _target;
 
 	int              _listen_port;
 	lo_server_thread _st;
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 31a64333..724035e5 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -85,7 +85,7 @@ OSCEngineSender::attach(int32_t ping_id, bool block)
  * traversal.  It is a parameter to remain compatible with EngineInterface.
  */
 void
-OSCEngineSender::register_client(Shared::ClientInterface* client)
+OSCEngineSender::register_client(ClientInterface* client)
 {
 	send("/register_client", "i", next_id(), LO_ARGS_END);
 }
@@ -124,11 +124,11 @@ OSCEngineSender::quit()
 // Object commands
 
 void
-OSCEngineSender::put(const Raul::URI&                    path,
-                     const Shared::Resource::Properties& properties,
-                     Shared::Resource::Graph             ctx)
+OSCEngineSender::put(const Raul::URI&            path,
+                     const Resource::Properties& properties,
+                     Resource::Graph             ctx)
 {
-	typedef Shared::Resource::Properties::const_iterator iterator;
+	typedef Resource::Properties::const_iterator iterator;
 	lo_message m = lo_message_new();
 	lo_message_add_int32(m, next_id());
 	lo_message_add_string(m, path.c_str());
@@ -141,8 +141,8 @@ OSCEngineSender::put(const Raul::URI&                    path,
 
 void
 OSCEngineSender::delta(const Raul::URI&                    path,
-                       const Shared::Resource::Properties& remove,
-                       const Shared::Resource::Properties& add)
+                       const Resource::Properties& remove,
+                       const Resource::Properties& add)
 {
 	warn << "FIXME: OSC DELTA" << endl;
 }
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 883749be..8c50592c 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -34,7 +34,7 @@ namespace Client {
  *
  * \ingroup IngenClient
  */
-class OSCEngineSender : public Shared::EngineInterface, public Shared::OSCSender {
+class OSCEngineSender : public EngineInterface, public Shared::OSCSender {
 public:
 	OSCEngineSender(const Raul::URI& engine_url);
 	~OSCEngineSender();
@@ -64,7 +64,7 @@ public:
 	void transfer_end()   { OSCSender::transfer_end(); }
 
 	// Client registration
-	void register_client(Shared::ClientInterface* client);
+	void register_client(ClientInterface* client);
 	void unregister_client(const Raul::URI& uri);
 
 	// Engine commands
@@ -75,13 +75,13 @@ public:
 
 	// Object commands
 
-	virtual void put(const Raul::URI&                    path,
-	                 const Shared::Resource::Properties& properties,
-	                 Shared::Resource::Graph             ctx=Shared::Resource::DEFAULT);
+	virtual void put(const Raul::URI&            path,
+	                 const Resource::Properties& properties,
+	                 Resource::Graph             ctx=Resource::DEFAULT);
 
-	virtual void delta(const Raul::URI&                    path,
-	                   const Shared::Resource::Properties& remove,
-	                   const Shared::Resource::Properties& add);
+	virtual void delta(const Raul::URI&            path,
+	                   const Resource::Properties& remove,
+	                   const Resource::Properties& add);
 
 	virtual void del(const Raul::Path& path);
 
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index af22f01f..f6610463 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -49,7 +49,7 @@ class ClientStore;
  *
  * \ingroup IngenClient
  */
-class ObjectModel : virtual public Ingen::Shared::GraphObject
+class ObjectModel : virtual public GraphObject
                   , public Ingen::Shared::ResourceImpl
 {
 public:
diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index 08b78692..190bc3ba 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -93,7 +93,7 @@ PatchModel::clear()
 }
 
 SharedPtr<ConnectionModel>
-PatchModel::get_connection(const Shared::Port* src_port, const Shared::Port* dst_port)
+PatchModel::get_connection(const Port* src_port, const Ingen::Port* dst_port)
 {
 	Connections::iterator i = _connections->find(make_pair(src_port, dst_port));
 	if (i != _connections->end())
@@ -137,7 +137,7 @@ PatchModel::add_connection(SharedPtr<ConnectionModel> cm)
 }
 
 void
-PatchModel::remove_connection(const Shared::Port* src_port, const Shared::Port* dst_port)
+PatchModel::remove_connection(const Port* src_port, const Ingen::Port* dst_port)
 {
 	Connections::iterator i = _connections->find(make_pair(src_port, dst_port));
 	if (i != _connections->end()) {
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index ec8031c4..775cfe29 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -28,7 +28,7 @@
 
 namespace Ingen {
 
-namespace Shared { class Port; }
+class Port;
 
 namespace Client {
 
@@ -38,15 +38,15 @@ class ClientStore;
  *
  * \ingroup IngenClient
  */
-class PatchModel : public NodeModel, public Ingen::Shared::Patch
+class PatchModel : public NodeModel, public Ingen::Patch
 {
 public:
 	/* WARNING: Copy constructor creates a shallow copy WRT connections */
 
 	const Connections& connections() const { return *_connections.get(); }
 
-	SharedPtr<ConnectionModel> get_connection(const Shared::Port* src_port,
-	                                          const Shared::Port* dst_port);
+	SharedPtr<ConnectionModel> get_connection(const Ingen::Port* src_port,
+	                                          const Ingen::Port* dst_port);
 
 	//uint32_t poly()          const { return _poly; }
 	bool     enabled()       const;
@@ -87,8 +87,8 @@ private:
 	bool remove_child(SharedPtr<ObjectModel> c);
 
 	void add_connection(SharedPtr<ConnectionModel> cm);
-	void remove_connection(const Shared::Port* src_port,
-	                       const Shared::Port* dst_port);
+	void remove_connection(const Ingen::Port* src_port,
+	                       const Ingen::Port* dst_port);
 
 	SharedPtr<Connections> _connections;
 	bool                   _editable;
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 3a4a80b5..49675ebc 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -45,15 +45,15 @@ class PluginUI;
  *
  * \ingroup IngenClient
  */
-class PluginModel : public Ingen::Shared::Plugin
+class PluginModel : public Ingen::Plugin
                   , public Ingen::Shared::ResourceImpl
 {
 public:
 	PluginModel(
-			Shared::LV2URIMap&                  uris,
-			const Raul::URI&                    uri,
-			const Raul::URI&                    type_uri,
-			const Shared::Resource::Properties& properties);
+			Shared::LV2URIMap&                 uris,
+			const Raul::URI&                   uri,
+			const Raul::URI&                   type_uri,
+			const Ingen::Resource::Properties& properties);
 
 	Type type() const { return _type; }
 
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 13adb436..266756e9 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -24,7 +24,11 @@
 #include "LV2Features.hpp"
 
 namespace Ingen {
-namespace Shared { class EngineInterface; class World; }
+
+class EngineInterface; 
+
+namespace Shared { class World; }
+
 namespace Client {
 
 class NodeModel;
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 8a62aed1..264f532e 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -35,7 +35,7 @@ namespace Client {
  *
  * \ingroup IngenClient
  */
-class PortModel : public ObjectModel, public Ingen::Shared::Port
+class PortModel : public ObjectModel, public Ingen::Port
 {
 public:
 	enum Direction { INPUT, OUTPUT };
@@ -52,7 +52,7 @@ public:
 
 	bool port_property(const std::string& uri) const;
 
-	bool is_numeric()     const { return is_a(Shared::PortType::CONTROL); }
+	bool is_numeric()     const { return is_a(PortType::CONTROL); }
 	bool is_logarithmic() const { return port_property("http://drobilla.net/ns/ingen#logarithmic"); }
 	bool is_integer()     const { return port_property("http://lv2plug.in/ns/lv2core#integer"); }
 	bool is_toggle()      const { return port_property("http://lv2plug.in/ns/lv2core#toggled"); }
@@ -86,7 +86,7 @@ private:
 	friend class ClientStore;
 
 	PortModel(Shared::LV2URIMap& uris,
-			const Raul::Path& path, uint32_t index, Shared::PortType type, Direction dir)
+			const Raul::Path& path, uint32_t index, PortType type, Direction dir)
 		: ObjectModel(uris, path)
 		, _index(index)
 		, _direction(dir)
@@ -94,7 +94,7 @@ private:
 		, _connections(0)
 	{
 		_types.insert(type);
-		if (type == Shared::PortType::UNKNOWN)
+		if (type == PortType::UNKNOWN)
 			Raul::warn << "[PortModel] Unknown port type" << std::endl;
 	}
 
@@ -106,11 +106,11 @@ private:
 
 	void set(SharedPtr<ObjectModel> model);
 
-	uint32_t                   _index;
-	std::set<Shared::PortType> _types;
-	Direction                  _direction;
-	Raul::Atom                 _current_val;
-	size_t                     _connections;
+	uint32_t           _index;
+	std::set<PortType> _types;
+	Direction          _direction;
+	Raul::Atom         _current_val;
+	size_t             _connections;
 };
 
 } // namespace Client
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index e58cc3ac..57a972f6 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -35,7 +35,8 @@ namespace Client {
  * The signals here match the calls to ClientInterface exactly.  See the
  * documentation for ClientInterface for meanings of signal parameters.
  */
-class SigClientInterface : public Ingen::Shared::ClientInterface, public sigc::trackable
+class SigClientInterface : public Ingen::ClientInterface,
+                           public sigc::trackable
 {
 public:
 	SigClientInterface() {}
@@ -49,10 +50,10 @@ public:
 	sigc::signal<void, std::string>                                 signal_error;
 	sigc::signal<void, Raul::Path, uint32_t>                        signal_new_patch;
 	sigc::signal<void, Raul::Path, Raul::URI, uint32_t, bool>       signal_new_port;
-	sigc::signal<void, Raul::URI, Shared::Resource::Properties,
-	                              Shared::Resource::Graph>          signal_put;
-	sigc::signal<void, Raul::URI, Shared::Resource::Properties,
-	                              Shared::Resource::Properties>     signal_delta;
+	sigc::signal<void, Raul::URI, Resource::Properties,
+	             Resource::Graph>                                   signal_put;
+	sigc::signal<void, Raul::URI, Resource::Properties,
+	             Resource::Properties>                              signal_delta;
 	sigc::signal<void, Raul::Path, Raul::Path>                      signal_object_moved;
 	sigc::signal<void, Raul::Path>                                  signal_object_deleted;
 	sigc::signal<void, Raul::Path, Raul::Path>                      signal_connection;
@@ -89,13 +90,14 @@ protected:
 	void error(const std::string& msg)
 		{ EMIT(error, msg); }
 
-	void put(const Raul::URI& uri,
-	         const Shared::Resource::Properties& properties,
-	         Shared::Resource::Graph             ctx=Shared::Resource::DEFAULT)
+	void put(const Raul::URI&            uri,
+	         const Resource::Properties& properties,
+	         Resource::Graph             ctx=Resource::DEFAULT)
 		{ EMIT(put, uri, properties, ctx); }
 
-	void delta(const Raul::URI& uri,
-			const Shared::Resource::Properties& remove, const Shared::Resource::Properties& add)
+	void delta(const Raul::URI&            uri,
+	           const Resource::Properties& remove,
+	           const Resource::Properties& add)
 		{ EMIT(delta, uri, remove, add); }
 
 	void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path)
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;
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index f8bd06a3..f1aa5c11 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -29,22 +29,22 @@
 using namespace Ingen;
 
 #ifdef HAVE_LIBLO
-SharedPtr<Ingen::Shared::EngineInterface>
+SharedPtr<Ingen::EngineInterface>
 new_osc_interface(Ingen::Shared::World* world, const std::string& url)
 {
 	Client::OSCEngineSender* oes = Client::OSCEngineSender::create(url);
 	oes->attach(rand(), true);
-	return SharedPtr<Shared::EngineInterface>(oes);
+	return SharedPtr<EngineInterface>(oes);
 }
 #endif
 
 #ifdef HAVE_SOUP
-SharedPtr<Ingen::Shared::EngineInterface>
+SharedPtr<Ingen::EngineInterface>
 new_http_interface(Ingen::Shared::World* world, const std::string& url)
 {
 	Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url);
 	hes->attach(rand(), true);
-	return SharedPtr<Shared::EngineInterface>(hes);
+	return SharedPtr<EngineInterface>(hes);
 }
 #endif