More copy/paste and serialisation work.

Don't die on invalid path for set_property and set_variable (return error to client).
Working paste to subpatches, paste of connected patch ports and modules.


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

1 files changed, 8 insertions, 4 deletions

diff --git a/src/libs/shared/ClashAvoider.hpp b/src/libs/shared/ClashAvoider.hpp
index 05b2cd6c..f70e839a 100644
--- a/src/libs/shared/ClashAvoider.hpp
+++ b/src/libs/shared/ClashAvoider.hpp
@@ -37,8 +37,8 @@ class Store;
 class ClashAvoider : public CommonInterface
 {
 public:
-	ClashAvoider(Store& store, CommonInterface& target)
-		: _store(store), _target(target) {}
+	ClashAvoider(Store& store, const Raul::Path& prefix, CommonInterface& target)
+		: _prefix(prefix), _store(store), _target(target) {}
 	
 	// Bundles
 	void bundle_begin() { _target.bundle_begin(); }
@@ -81,8 +81,12 @@ public:
 private:
 	const Raul::Path& map_path(const Raul::Path& in);
 
-	Store&           _store;
-	CommonInterface& _target;
+	const Raul::Path& _prefix;
+	Store&            _store;
+	CommonInterface&  _target;
+
+	typedef std::map<Raul::Symbol, unsigned> Offsets;
+	Offsets _offsets;
 
 	typedef std::map<Raul::Path, Raul::Path> SymbolMap;
 	SymbolMap _symbol_map;