11 files changed, 14 insertions, 280 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index cac4201d..5539e958 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -24,7 +24,7 @@
 #include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
 #include "ingen/Port.hpp"
-#include "shared/Builder.hpp"
+#include "ingen/shared/Builder.hpp"
 #include "shared/LV2URIMap.hpp"
 
 using namespace std;
diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp
deleted file mode 100644
index 8a21dee0..00000000
--- a/src/shared/Builder.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_BUILDER_HPP
-#define INGEN_SHARED_BUILDER_HPP
-
-#include "raul/SharedPtr.hpp"
-
-namespace Ingen {
-
-class CommonInterface;
-class GraphObject;
-
-namespace Shared {
-
-class LV2URIMap;
-
-/** Wrapper for CommonInterface to create existing objects/models.
- *
- * \ingroup interface
- */
-class Builder
-{
-public:
-	Builder(SharedPtr<Shared::LV2URIMap> uris, CommonInterface& interface);
-	virtual ~Builder() {}
-
-	void build(SharedPtr<const GraphObject> object);
-	void connect(SharedPtr<const GraphObject> object);
-
-private:
-	void build_object(SharedPtr<const GraphObject> object);
-
-	SharedPtr<Shared::LV2URIMap> _uris;
-	CommonInterface&             _interface;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_BUILDER_HPP
-
-
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index f2232554..b9135951 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -17,8 +17,11 @@
 
 #include <cstdio>
 #include <sstream>
+
 #include "raul/log.hpp"
-#include "ClashAvoider.hpp"
+
+#include "ingen/shared/ClashAvoider.hpp"
+
 #include "Store.hpp"
 
 using namespace std;
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
deleted file mode 100644
index 6c8e2018..00000000
--- a/src/shared/ClashAvoider.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_CLASHAVOIDER_HPP
-#define INGEN_SHARED_CLASHAVOIDER_HPP
-
-#include <inttypes.h>
-
-#include <map>
-
-#include "ingen/CommonInterface.hpp"
-
-namespace Raul { class Atom; class Path; }
-
-namespace Ingen {
-namespace Shared {
-
-class Store;
-
-/** A wrapper for a CommonInterface that creates objects but possibly maps
- * symbol names to avoid clashes with the existing objects in a store.
- */
-class ClashAvoider : public CommonInterface
-{
-public:
-	ClashAvoider(Store& store, CommonInterface& target, Store* also_avoid=NULL)
-		: _store(store), _target(target), _also_avoid(also_avoid) {}
-
-	void set_target(CommonInterface& target) { _target = target; }
-
-	// Bundles
-	void bundle_begin() { _target.bundle_begin(); }
-	void bundle_end()   { _target.bundle_end(); }
-
-	// Object commands
-
-	virtual void put(const Raul::URI&            path,
-	                 const Resource::Properties& properties,
-	                 Resource::Graph             ctx=Resource::DEFAULT);
-
-	virtual void delta(const Raul::URI&            path,
-	                   const Resource::Properties& remove,
-	                   const Resource::Properties& add);
-
-	virtual void move(const Raul::Path& old_path,
-	                  const Raul::Path& new_path);
-
-	virtual void connect(const Raul::Path& src_port_path,
-	                     const Raul::Path& dst_port_path);
-
-	virtual void disconnect(const Raul::URI& src,
-	                        const Raul::URI& dst);
-
-	virtual void disconnect_all(const Raul::Path& parent_patch_path,
-	                            const Raul::Path& path);
-
-	virtual void set_property(const Raul::URI&  subject_path,
-	                          const Raul::URI&  predicate,
-	                          const Raul::Atom& value);
-
-	virtual void del(const Raul::URI& uri);
-
-private:
-	const Raul::URI  map_uri(const Raul::URI& in);
-	const Raul::Path map_path(const Raul::Path& in);
-
-	Store&            _store;
-	CommonInterface&  _target;
-
-	Store* _also_avoid;
-	bool exists(const Raul::Path& path) const;
-
-	typedef std::map<Raul::Path, unsigned> Offsets;
-	Offsets _offsets;
-
-	typedef std::map<Raul::Path, Raul::Path> SymbolMap;
-	SymbolMap _symbol_map;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_CLASHAVOIDER_HPP
-
diff --git a/src/shared/Configuration.cpp b/src/shared/Configuration.cpp
index fca13b05..4cfc41e9 100644
--- a/src/shared/Configuration.cpp
+++ b/src/shared/Configuration.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/Atom.hpp"
 
-#include "Configuration.hpp"
+#include "ingen/shared/Configuration.hpp"
 
 using namespace Raul;
 
diff --git a/src/shared/Configuration.hpp b/src/shared/Configuration.hpp
deleted file mode 100644
index e51bdc71..00000000
--- a/src/shared/Configuration.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2010-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_CONFIGURATION_HPP
-#define INGEN_SHARED_CONFIGURATION_HPP
-
-#include "raul/Configuration.hpp"
-
-namespace Ingen {
-namespace Shared {
-
-class Configuration : public Raul::Configuration {
-public:
-	Configuration();
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_CONFIGURATION_HPP
-
diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp
index 4f6afec4..4b4cbec5 100644
--- a/src/shared/LV2Atom.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -15,12 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "raul/log.hpp"
-#include "raul/Atom.hpp"
-#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+#include "ingen/shared/LV2Atom.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+#include "raul/Atom.hpp"
+#include "raul/log.hpp"
+
 #include "LV2Features.hpp"
-#include "LV2Atom.hpp"
 #include "LV2URIMap.hpp"
 
 using namespace std;
diff --git a/src/shared/LV2Atom.hpp b/src/shared/LV2Atom.hpp
deleted file mode 100644
index df9ffde9..00000000
--- a/src/shared/LV2Atom.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2009-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_LV2ATOM_HPP
-#define INGEN_SHARED_LV2ATOM_HPP
-
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-
-namespace Raul { class Atom; }
-
-namespace Ingen {
-namespace Shared {
-
-class LV2URIMap;
-
-namespace LV2Atom {
-
-bool to_atom(const LV2URIMap& uris,
-             const LV2_Atom*  object,
-             Raul::Atom&      atom);
-
-bool from_atom(const LV2URIMap&  uris,
-               const Raul::Atom& atom,
-               LV2_Atom*         object);
-
-} // namespace LV2Atom
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_LV2ATOM_HPP
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index e6742c85..19e85a15 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -26,7 +26,7 @@
 #include "sord/sordmm.hpp"
 
 #include "ingen/EngineBase.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "World.hpp"
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index d533c883..cf37d07b 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -25,8 +25,9 @@
 
 #include "raul/log.hpp"
 
+#include "ingen/shared/runtime_paths.hpp"
+
 #include "ingen-config.h"
-#include "runtime_paths.hpp"
 
 using namespace std;
 
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
deleted file mode 100644
index 3ed48f00..00000000
--- a/src/shared/runtime_paths.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_RUNTIME_PATHS_HPP
-#define INGEN_SHARED_RUNTIME_PATHS_HPP
-
-#include <string>
-
-namespace Ingen {
-namespace Shared {
-
-void set_bundle_path(const char* path);
-void set_bundle_path_from_code(void* function);
-
-std::string bundle_file_path(const std::string& name);
-std::string data_file_path(const std::string& name);
-std::string module_path(const std::string& name, std::string dir="");
-
-} // namespace Ingen
-} // namespace Shared
-
-#endif // INGEN_SHARED_RUNTIME_PATHS_HPP