diff options
| author | David Robillard <d@drobilla.net> | 2007-12-04 23:03:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-12-04 23:03:45 +0000 |
| commit | 2ab01419f334b834710a41fd26a538df3522cf49 (patch) | |
| tree | bd1c1f1662797d9ca50f9bd8eddb1b44908d1e37 /src/gui | |
| parent | 1760218d029892fc9ba3b25e06479cce319f20a0 (diff) | |
| download | machina-2ab01419f334b834710a41fd26a538df3522cf49.tar.gz machina-2ab01419f334b834710a41fd26a538df3522cf49.tar.bz2 machina-2ab01419f334b834710a41fd26a538df3522cf49.zip | |
Fix stuck notes on stop.
git-svn-id: http://svn.drobilla.net/lad/machina@948 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index f8939b4..2e383ec 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -376,7 +376,7 @@ MachinaGUI::menu_import_midi() if (machine) { dialog.hide(); machine->activate(); - machine->reset(); + machine->reset(machine->time()); _canvas->build(machine); _engine->driver()->set_machine(machine); } else { @@ -406,7 +406,7 @@ MachinaGUI::menu_export_midi() file_driver->writer()->start(dialog.get_filename()); file_driver->run(m, 32); // TODO: solve halting problem m->set_sink(_engine->driver()); - m->reset(); + m->reset(m->time()); file_driver->writer()->finish(); _engine->driver()->activate(); } @@ -492,10 +492,11 @@ void MachinaGUI::stop_clicked() { if (_engine->driver()->recording()) { - _engine->driver()->finish_record(); + _engine->driver()->stop(); + _canvas->build(_engine->machine()); + update_toolbar(); } else { - _engine->machine()->deactivate(); - _engine->driver()->reset(); + _engine->driver()->stop(); } update_toolbar(); |