From 602e31074b30167baace71ccfff1f58a6b3f0626 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 17 Aug 2008 18:58:24 +0000
Subject: More serialization work. Preliminary copy/paste (nodes only)

git-svn-id: http://svn.drobilla.net/lad/ingen@1418 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/serialisation/Parser.hpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'src/libs/serialisation/Parser.hpp')

diff --git a/src/libs/serialisation/Parser.hpp b/src/libs/serialisation/Parser.hpp
index 2aaf3bfb..4ee94d46 100644
--- a/src/libs/serialisation/Parser.hpp
+++ b/src/libs/serialisation/Parser.hpp
@@ -54,18 +54,21 @@ public:
 			Shared::CommonInterface*                target,
 			const Glib::ustring&                    str,
 			const Glib::ustring&                    base_uri,
-			Glib::ustring                           object_uri,
+			boost::optional<Glib::ustring>          object_uri=boost::optional<Glib::ustring>(),
 			boost::optional<Raul::Path>             parent=boost::optional<Raul::Path>(),
 			boost::optional<Raul::Symbol>           symbol=boost::optional<Raul::Symbol>(),
 			boost::optional<GraphObject::Variables> data=boost::optional<GraphObject::Variables>());
 
 private:
+
+	Glib::ustring uri_relative_to_base(const Glib::ustring base, const Glib::ustring uri);
+
 	bool parse(
 			Ingen::Shared::World*                   world,
 			Shared::CommonInterface*                target,
 			Redland::Model&                         model,
-			const Glib::ustring&                    base_uri,
-			Glib::ustring                           object_uri,
+			Glib::ustring                           base_uri,
+			boost::optional<Glib::ustring>          object_uri=boost::optional<Glib::ustring>(),
 			boost::optional<Raul::Path>             parent=boost::optional<Raul::Path>(),
 			boost::optional<Raul::Symbol>           symbol=boost::optional<Raul::Symbol>(),
 			boost::optional<GraphObject::Variables> data=boost::optional<GraphObject::Variables>());
@@ -82,9 +85,28 @@ private:
 			Ingen::Shared::World*                   world,
 			Ingen::Shared::CommonInterface*         target,
 			Redland::Model&                         model,
+			const Glib::ustring&                    base_uri,
 			const Glib::ustring&                    object_uri,
 			Raul::Path                              path,
 			boost::optional<GraphObject::Variables> data);
+	
+	bool parse_node(
+			Ingen::Shared::World*                   world,
+			Ingen::Shared::CommonInterface*         target,
+			Redland::Model&                         model,
+			const Glib::ustring&                    base_uri,
+			Glib::ustring                           subject,
+			Raul::Path                              path,
+			boost::optional<GraphObject::Variables> data);
+	
+	bool parse_variables(
+			Ingen::Shared::World*                   world,
+			Ingen::Shared::CommonInterface*         target,
+			Redland::Model&                         model,
+			const Glib::ustring&                    base_uri,
+			const Glib::ustring&                    subject,
+			Raul::Path                              path,
+			boost::optional<GraphObject::Variables> data);
 };
 
 
-- 
cgit v1.2.1