diff options
| author | David Robillard <d@drobilla.net> | 2007-04-02 01:52:53 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-02 01:52:53 +0000 |
| commit | db6f6e87dc4ff620f399597913f14a3b4eda277f (patch) | |
| tree | 4258f8cc7f2a841fd41ce9dac222919f0ee98eeb /src/engine/machina | |
| parent | 69ad86f21555d28f5065923eea06ccc3cc4f4ce5 (diff) | |
| download | machina-db6f6e87dc4ff620f399597913f14a3b4eda277f.tar.gz machina-db6f6e87dc4ff620f399597913f14a3b4eda277f.tar.bz2 machina-db6f6e87dc4ff620f399597913f14a3b4eda277f.zip | |
Edge label toggling.
Made state properties dialog actually work.
Other things...
git-svn-id: http://svn.drobilla.net/lad/machina@390 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina')
| -rw-r--r-- | src/engine/machina/Driver.hpp | 3 | ||||
| -rw-r--r-- | src/engine/machina/Engine.hpp | 1 | ||||
| -rw-r--r-- | src/engine/machina/JackDriver.hpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp index bf4d2be..acc4278 100644 --- a/src/engine/machina/Driver.hpp +++ b/src/engine/machina/Driver.hpp @@ -1,4 +1,5 @@ /* This file is part of Machina. + * _engine->driver()->reset_time(); * Copyright (C) 2007 Dave Robillard <http://drobilla.net> * * Machina is free software; you can redistribute it and/or modify it under the @@ -39,6 +40,8 @@ public: virtual void activate() {} virtual void deactivate() {} + virtual void reset() {} + virtual bool recording() { return false; } virtual void start_record() {} virtual void finish_record() {} diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp index 82c21ba..dc47b2a 100644 --- a/src/engine/machina/Engine.hpp +++ b/src/engine/machina/Engine.hpp @@ -37,6 +37,7 @@ public: SharedPtr<Machine> machine() { return _driver->machine(); } SharedPtr<Machine> load_machine(const Glib::ustring& uri); + SharedPtr<Machine> import_machine(const Glib::ustring& uri); SharedPtr<Machine> learn_midi(const Glib::ustring& uri); void set_bpm(double bpm); diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp index 47b718d..1ab6643 100644 --- a/src/engine/machina/JackDriver.hpp +++ b/src/engine/machina/JackDriver.hpp @@ -62,6 +62,8 @@ public: void set_bpm(double bpm) { _bpm.set(bpm); } void set_quantization(double quantization) { _quantization.set(quantization); } + void reset(); + bool recording() { return _recording.get(); } void start_record(); void finish_record(); |