2 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp
index 7e0c9bc..39974f1 100644
--- a/src/engine/machina/Engine.hpp
+++ b/src/engine/machina/Engine.hpp
@@ -54,8 +54,6 @@ public:
 	                                double               q,
 	                                Raul::TimeDuration   dur);
 
-	void import_machine(SPtr<Machine> machine);
-
 	void export_midi(const Glib::ustring& filename,
 	                 Raul::TimeDuration   dur);
 
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 8a98e4c..d4eccea 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -51,7 +51,11 @@ public:
 	 */
 	Machine(const Machine& copy);
 
-	Machine& operator=(const Machine& other);
+	/** Completely replace this machine's contents with a deep copy. */
+	Machine& operator=(const Machine& copy);
+
+	/** Merge another machine into this machine. */
+	void merge(const Machine& machine);
 
 	bool is_empty()    { return _nodes.empty(); }
 	bool is_finished() { return _is_finished; }