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

8 files changed, 22 insertions, 25 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 56d94b2e..8844b320 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -32,12 +32,9 @@
 using namespace std;
 
 namespace Ingen {
-
-using namespace Shared;
-
 namespace Client {
 
-ClientStore::ClientStore(Shared::URIs&                 uris,
+ClientStore::ClientStore(URIs&                         uris,
                          SharedPtr<Interface>          engine,
                          SharedPtr<SigClientInterface> emitter)
 	: _uris(uris)
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 2a88b4db..dbbb0258 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -19,13 +19,13 @@
 #include <string>
 
 #include "ingen/client/NodeModel.hpp"
-#include "ingen/shared/URIs.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
 
 namespace Ingen {
 namespace Client {
 
-NodeModel::NodeModel(Shared::URIs&          uris,
+NodeModel::NodeModel(URIs&                  uris,
                      SharedPtr<PluginModel> plugin,
                      const Raul::Path&      path)
 	: ObjectModel(uris, path)
@@ -37,7 +37,7 @@ NodeModel::NodeModel(Shared::URIs&          uris,
 {
 }
 
-NodeModel::NodeModel(Shared::URIs&     uris,
+NodeModel::NodeModel(URIs&             uris,
                      const Raul::URI&  plugin_uri,
                      const Raul::Path& path)
 	: ObjectModel(uris, path)
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 9a5009ba..2679186b 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -16,13 +16,13 @@
 
 #include "ingen/GraphObject.hpp"
 #include "ingen/client/ObjectModel.hpp"
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
 #include "raul/TableImpl.hpp"
 
 namespace Ingen {
 namespace Client {
 
-ObjectModel::ObjectModel(Shared::URIs& uris, const Raul::Path& path)
+ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path)
 	: GraphObject(uris, path)
 	, _path(path)
 	, _symbol((path == Raul::Path::root()) ? "root" : path.symbol())
diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index 7acb8aec..bd2547b0 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -22,7 +22,7 @@
 #include "ingen/client/EdgeModel.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
 
 using namespace std;
 
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index f4df6d1c..ab1df485 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -40,7 +40,7 @@ const LilvPlugins* PluginModel::_lilv_plugins = NULL;
 
 Sord::World* PluginModel::_rdf_world = NULL;
 
-PluginModel::PluginModel(Shared::URIs&               uris,
+PluginModel::PluginModel(URIs&                       uris,
                          const Raul::URI&            uri,
                          const Raul::URI&            type_uri,
                          const Resource::Properties& properties)
@@ -215,7 +215,7 @@ PluginModel::has_ui() const
 }
 
 SharedPtr<PluginUI>
-PluginModel::ui(Ingen::Shared::World*      world,
+PluginModel::ui(Ingen::World*              world,
                 SharedPtr<const NodeModel> node) const
 {
 	if (!_lilv_plugin) {
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 0c597490..0f61924a 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -14,14 +14,14 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "raul/log.hpp"
-
+#include "ingen/Interface.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PluginUI.hpp"
 #include "ingen/client/PortModel.hpp"
-#include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "raul/log.hpp"
 
 using namespace std;
 
@@ -48,7 +48,7 @@ lv2_ui_write(SuilController controller,
 
 	SharedPtr<const PortModel> port = ports[port_index];
 
-	const Shared::URIs& uris = ui->world()->uris();
+	const URIs& uris = ui->world()->uris();
 
 	// float (special case, always 0)
 	if (format == 0) {
@@ -75,7 +75,7 @@ lv2_ui_write(SuilController controller,
 	}
 }
 
-PluginUI::PluginUI(Ingen::Shared::World*      world,
+PluginUI::PluginUI(Ingen::World*              world,
                    SharedPtr<const NodeModel> node,
                    const LilvNode*            ui_node)
 	: _world(world)
@@ -92,7 +92,7 @@ PluginUI::~PluginUI()
 }
 
 SharedPtr<PluginUI>
-PluginUI::create(Ingen::Shared::World*      world,
+PluginUI::create(Ingen::World*              world,
                  SharedPtr<const NodeModel> node,
                  const LilvPlugin*          plugin)
 {
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index 753917cf..46a14dc1 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -14,22 +14,22 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/Module.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Module.hpp"
+#include "ingen/World.hpp"
 #include "raul/SharedPtr.hpp"
 
 #include "ingen_config.h"
 
 using namespace Ingen;
 
-struct IngenClientModule : public Ingen::Shared::Module {
-	void load(Ingen::Shared::World* world) {
+struct IngenClientModule : public Ingen::Module {
+	void load(Ingen::World* world) {
 	}
 };
 
 extern "C" {
 
-Ingen::Shared::Module*
+Ingen::Module*
 ingen_module_load()
 {
 	return new IngenClientModule();
diff --git a/src/client/wscript b/src/client/wscript
index c3830506..b0b0620e 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -8,7 +8,7 @@ def build(bld):
               name            = 'libingen_client',
               target          = 'ingen_client',
               install_path    = '${LIBDIR}',
-              use             = 'libingen_shared')
+              use             = 'libingen')
     autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV SUIL RAUL SORD SIGCPP')
 
     obj.source = '''