Rewrite pretty much everything to do with paths in Serialiser to actually make an ounce of sense.

Fix various things with nested patches (fix tickets #286 #289).
Cascade successive pastes nicely.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index fee298d8..50e5deb1 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -57,13 +57,13 @@ class ThreadedLoader : public Raul::Slave
 public:
 	ThreadedLoader(SharedPtr<EngineInterface> engine);
 
-	void load_patch(bool                    merge,
-	                const Glib::ustring&    data_base_uri,
-	                const Path&             data_path,
-	                GraphObject::Variables  engine_data,
-	                optional<Path>          engine_parent = optional<Path>(),
-	                optional<Symbol>        engine_symbol = optional<Symbol>());
-	
+	void load_patch(bool                             merge,
+                    const Glib::ustring&             document_uri,
+                    optional<Path>                   data_path,
+                    optional<Path>                   engine_parent,
+                    optional<Symbol>                 engine_symbol,
+                    optional<GraphObject::Variables> engine_data);
+
 	void save_patch(SharedPtr<PatchModel> model, const string& filename);
 
 	SharedPtr<Parser> parser();