From 448d6e329a55848e357d57f8ca225d987627ee08 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 13 Jan 2013 09:23:42 +0000 Subject: Move merge operation to Machine::merge(). Delete unused Engine::import_machine(). git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4956 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/machina/Engine.hpp | 2 -- src/engine/machina/Machine.hpp | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/engine/machina') 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); - 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; } -- cgit v1.2.1