Moved loading out to it's own namespace.

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

1 files changed, 18 insertions, 27 deletions

diff --git a/src/libs/client/Loader.h b/src/libs/client/Loader.h
index 371e7065..74aa7cbb 100644
--- a/src/libs/client/Loader.h
+++ b/src/libs/client/Loader.h
@@ -18,41 +18,32 @@
 #ifndef LOADER_H
 #define LOADER_H
 
-#include <boost/optional.hpp>
+#include <string>
+#include <map>
 #include <glibmm/ustring.h>
-#include "raul/SharedPtr.h"
-#include "raul/Path.h"
-#include "ObjectModel.h"
+#include <boost/optional.hpp>
+#include <raul/SharedPtr.h>
+#include <raul/Path.h>
 
-namespace Raul { namespace RDF { class World; } }
+namespace Raul { class Atom; namespace RDF { class World; } }
+namespace Ingen { namespace Shared { class EngineInterface; } }
 
 namespace Ingen {
-namespace Client {
-
-class ModelEngineInterface;
-
-
-/** Loads objects (patches, nodes, etc) into the engine from RDF.
- */
-class Loader {
-public:
-	Loader(SharedPtr<ModelEngineInterface> engine, Raul::RDF::World* rdf_world);
+namespace Serialisation {
 
-	bool load(Raul::RDF::World*     world,
-	          const Glib::ustring&  uri,
-	          boost::optional<Path> parent,
-			  string                patch_name,
-	          Glib::ustring         patch_uri = "",
-	          MetadataMap           initial_data = MetadataMap());
+typedef std::map<std::string, Raul::Atom> Metadata;
 
-private:
-	//string                          _patch_search_path;
-	SharedPtr<ModelEngineInterface> _engine;
-	Raul::RDF::World*               _rdf_world;
-};
+bool
+load(SharedPtr<Ingen::Shared::EngineInterface> engine,
+     Raul::RDF::World*                         world,
+     const Glib::ustring&                      uri,
+     boost::optional<Raul::Path>               parent,
+     std::string                               patch_name,
+     Glib::ustring                             patch_uri = "",
+     Metadata                                  data = Metadata());
 
 
-} // namespace Client
+} // namespace Serialisation
 } // namespace Ingen
 
 #endif // LOADER_H