Merge Ingen::Shared namespace into Ingen namespace and core libingen library.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1

9 files changed, 25 insertions, 36 deletions

diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index f7e570f0..f1b65fa3 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
@@ -49,7 +49,7 @@ CreateNode::CreateNode(Engine&                     engine,
 bool
 CreateNode::pre_process()
 {
-	Ingen::Shared::URIs& uris = _engine.world()->uris();
+	Ingen::URIs& uris = _engine.world()->uris();
 
 	typedef Resource::Properties::const_iterator iterator;
 
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index 602fe2a4..476ccccb 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
@@ -58,7 +58,7 @@ CreatePatch::pre_process()
 		return Event::pre_process_done(PARENT_NOT_FOUND, path.parent());
 	}
 
-	const Ingen::Shared::URIs& uris = _engine.world()->uris();
+	const Ingen::URIs& uris = _engine.world()->uris();
 
 	typedef Resource::Properties::const_iterator iterator;
 
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index b89a90cc..c62e858c 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -16,8 +16,8 @@
 
 #include <utility>
 
-#include "ingen/shared/URIMap.hpp"
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIMap.hpp"
+#include "ingen/URIs.hpp"
 #include "raul/Array.hpp"
 #include "raul/Atom.hpp"
 #include "raul/Path.hpp"
@@ -54,7 +54,7 @@ CreatePort::CreatePort(Engine&                     engine,
 	, _properties(properties)
 	, _is_output(is_output)
 {
-	const Ingen::Shared::URIs& uris = _engine.world()->uris();
+	const Ingen::URIs& uris = _engine.world()->uris();
 
 	typedef Resource::Properties::const_iterator Iterator;
 	typedef std::pair<Iterator, Iterator>        Range;
@@ -96,7 +96,7 @@ CreatePort::pre_process()
 		return Event::pre_process_done(PARENT_NOT_FOUND, _path.parent());
 	}
 
-	const Shared::URIs&  uris           = _engine.world()->uris();
+	const URIs&          uris           = _engine.world()->uris();
 	const BufferFactory& buffer_factory = *_engine.buffer_factory();
 
 	const uint32_t buf_size    = buffer_factory.default_size(_buf_type);
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 4e9ca791..a497bb37 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -18,7 +18,7 @@
 
 #include <glibmm/thread.h>
 
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
 #include "raul/Maid.hpp"
 
 #include "Broadcaster.hpp"
@@ -29,7 +29,6 @@
 #include "Delta.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
-#include "GraphObjectImpl.hpp"
 #include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
@@ -39,7 +38,7 @@
 #define LOG(s) s << "[Delta] "
 
 // #define DUMP 1
-// #include "ingen/shared/URIMap.hpp"
+// #include "ingen/URIMap.hpp"
 
 namespace Ingen {
 namespace Server {
@@ -115,7 +114,7 @@ Delta::pre_process()
 		return Event::pre_process_done(NOT_FOUND, _subject);
 	}
 
-	const Ingen::Shared::URIs& uris = _engine.world()->uris();
+	const Ingen::URIs& uris = _engine.world()->uris();
 
 	if (is_graph_object && !_object) {
 		Raul::Path path(_subject.str());
@@ -146,16 +145,6 @@ Delta::pre_process()
 
 	GraphObjectImpl* obj = dynamic_cast<GraphObjectImpl*>(_object);
 
-#if 0
-	// If we're replacing (i.e. this is a PUT, not a POST), first remove all properties
-	// with keys we will later set.  This must be done first so a PUT with several properties
-	// of the same predicate (e.g. rdf:type) retains the multiple values.  Only previously
-	// existing properties should be replaced
-	if (_replace)
-		for (Properties::iterator p = _properties.begin(); p != _properties.end(); ++p)
-			obj->properties().erase(p->first);
-#endif
-
 	for (Properties::const_iterator p = _remove.begin(); p != _remove.end(); ++p) {
 		const Raul::URI&  key   = p->first;
 		const Raul::Atom& value = p->second;
@@ -260,7 +249,7 @@ Delta::execute(ProcessContext& context)
 		return;
 	}
 
-	const Ingen::Shared::URIs& uris = _engine.world()->uris();
+	const Ingen::URIs& uris = _engine.world()->uris();
 
 	if (_create_event) {
 		_create_event->set_time(_time);
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 33cd236b..6632750f 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -59,9 +59,9 @@ DisconnectAll::DisconnectAll(Engine&              engine,
 
 /** Internal version for use by other events.
  */
-DisconnectAll::DisconnectAll(Engine&          engine,
-                             PatchImpl*       parent,
-                             GraphObjectImpl* object)
+DisconnectAll::DisconnectAll(Engine&      engine,
+                             PatchImpl*   parent,
+                             GraphObject* object)
 	: Event(engine)
 	, _parent_path(parent->path())
 	, _path(object->path())
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index a6d5d3d6..12c04ffa 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -50,9 +50,9 @@ public:
 	              const Raul::Path&    parent,
 	              const Raul::Path&    object);
 
-	DisconnectAll(Engine&          engine,
-	              PatchImpl*       parent,
-	              GraphObjectImpl* object);
+	DisconnectAll(Engine&      engine,
+	              PatchImpl*   parent,
+	              GraphObject* object);
 
 	~DisconnectAll();
 
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index cc64aaef..f2204e67 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -134,7 +134,7 @@ Get::post_process()
 			_engine.broadcaster()->send_plugins_to(_request_client.get(), _plugins);
 		} else if (_uri == "ingen:engine") {
 			// TODO: Keep a proper RDF model of the engine
-			Shared::URIs& uris = _engine.world()->uris();
+			URIs& uris = _engine.world()->uris();
 			_request_client->set_property(
 				uris.ingen_engine,
 				uris.ingen_sampleRate,
diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp
index adc3f0bb..fd1059ad 100644
--- a/src/server/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -26,7 +26,7 @@
 namespace Ingen {
 namespace Server {
 
-class GraphObjectImpl;
+class GraphObject;
 class PluginImpl;
 
 namespace Events {
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index e0a56489..52d17c32 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -14,9 +14,9 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/URIs.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/LV2Features.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
 #include "raul/log.hpp"
 
 #include "AudioBuffer.hpp"
@@ -96,8 +96,8 @@ SetPortValue::apply(Context& context)
 		return;
 	}
 
-	Ingen::Shared::URIs& uris = _engine.world()->uris();
-	Buffer* const        buf  = _port->buffer(0).get();
+	Ingen::URIs&  uris = _engine.world()->uris();
+	Buffer* const buf  = _port->buffer(0).get();
 
 	AudioBuffer* const abuf = dynamic_cast<AudioBuffer*>(buf);
 	if (abuf) {