Begin using shared virtual Node interface client side.

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

2 files changed, 12 insertions, 11 deletions

diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index a911eb72..45d66740 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -41,12 +41,12 @@ namespace Serialisation {
  */
 bool
 Loader::load(SharedPtr<EngineInterface> engine,
-		Raul::RDF::World*          rdf_world,
-		const Glib::ustring&       document_uri,
-		boost::optional<Path>      parent,
-		string                     patch_name,
-		Glib::ustring              patch_uri,
-		Raul::Table<string, Atom>  data)
+		Raul::RDF::World*               rdf_world,
+		const Glib::ustring&            document_uri,
+		boost::optional<Path>           parent,
+		string                          patch_name,
+		Glib::ustring                   patch_uri,
+		GraphObject::MetadataMap        data)
 {
 	setlocale(LC_NUMERIC, "C");
 
@@ -67,7 +67,7 @@ Loader::load(SharedPtr<EngineInterface> engine,
 	size_t patch_poly = 1;
 	
 	/* Use parameter overridden polyphony, if given */
-	Raul::Table<string, Atom>::iterator poly_param = data.find("ingen:polyphony");
+	GraphObject::MetadataMap::iterator poly_param = data.find("ingen:polyphony");
 	if (poly_param != data.end() && poly_param->second.type() == Atom::INT) {
 		patch_poly = poly_param->second.get_int32();
 	
@@ -358,7 +358,7 @@ Loader::load(SharedPtr<EngineInterface> engine,
 
 
 	// Set passed metadata last to override any loaded values
-	for (Metadata::const_iterator i = data.begin(); i != data.end(); ++i)
+	for (GraphObject::MetadataMap::const_iterator i = data.begin(); i != data.end(); ++i)
 		engine->set_metadata(patch_path, i->first, i->second);
 
 
diff --git a/src/libs/serialisation/Loader.hpp b/src/libs/serialisation/Loader.hpp
index 87465880..158831cb 100644
--- a/src/libs/serialisation/Loader.hpp
+++ b/src/libs/serialisation/Loader.hpp
@@ -25,10 +25,13 @@
 #include <raul/Path.hpp>
 #include <raul/Atom.hpp>
 #include <raul/Table.hpp>
+#include "interface/GraphObject.hpp"
 
 namespace Raul { class Atom; namespace RDF { class World; } }
 namespace Ingen { namespace Shared { class EngineInterface; } }
 
+using namespace Ingen::Shared;
+
 namespace Ingen {
 namespace Serialisation {
 
@@ -37,8 +40,6 @@ class Loader {
 public:
 	virtual ~Loader() {}
 	
-	typedef Raul::Table<std::string, Raul::Atom> Metadata;
-	
 	virtual bool
 	load(SharedPtr<Ingen::Shared::EngineInterface> engine,
 	     Raul::RDF::World*                         world,
@@ -46,7 +47,7 @@ public:
 	     boost::optional<Raul::Path>               parent,
 	     std::string                               patch_name,
 	     Glib::ustring                             patch_uri = "",
-	     Metadata                                  data = Metadata());
+	     GraphObject::MetadataMap                  data = GraphObject::MetadataMap());
 };