diff options
| author | David Robillard <d@drobilla.net> | 2013-01-13 09:23:42 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-13 09:23:42 +0000 |
| commit | 448d6e329a55848e357d57f8ca225d987627ee08 (patch) | |
| tree | 0153d22bedf929173b973b98c6840fd010b06aca /src/engine/machina | |
| parent | 67a8adbc93991acfb688f378f52392995a272fac (diff) | |
| download | machina-448d6e329a55848e357d57f8ca225d987627ee08.tar.gz machina-448d6e329a55848e357d57f8ca225d987627ee08.tar.bz2 machina-448d6e329a55848e357d57f8ca225d987627ee08.zip | |
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
Diffstat (limited to 'src/engine/machina')
| -rw-r--r-- | src/engine/machina/Engine.hpp | 2 | ||||
| -rw-r--r-- | src/engine/machina/Machine.hpp | 6 |
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; } |