From db6f6e87dc4ff620f399597913f14a3b4eda277f Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 2 Apr 2007 01:52:53 +0000
Subject: 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
---
 src/engine/machina/Driver.hpp     | 3 +++
 src/engine/machina/Engine.hpp     | 1 +
 src/engine/machina/JackDriver.hpp | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'src/engine/machina')

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();
-- 
cgit v1.2.1