aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/machina
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-03-12 03:04:27 +0000
committerDavid Robillard <d@drobilla.net>2007-03-12 03:04:27 +0000
commit218b41a2fbaab0540780e0bd45bea135c7c98bd3 (patch)
tree0fee8bec4761b5f63c0d4509f689860a501c103e /src/engine/machina
parentee76743c774f64759daef42d416d3fb7bbc4a473 (diff)
downloadmachina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.tar.gz
machina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.tar.bz2
machina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.zip
Fixed edge label size when zooming.
Importing of multi-track MIDI files. git-svn-id: http://svn.drobilla.net/lad/machina@355 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina')
-rw-r--r--src/engine/machina/SMFDriver.hpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/machina/SMFDriver.hpp b/src/engine/machina/SMFDriver.hpp
index f5d1229..f9b266b 100644
--- a/src/engine/machina/SMFDriver.hpp
+++ b/src/engine/machina/SMFDriver.hpp
@@ -22,6 +22,7 @@
#include <glibmm/ustring.h>
#include <raul/SharedPtr.h>
#include <raul/SMFWriter.h>
+#include <raul/SMFReader.h>
#include "machina/types.hpp"
#include "machina/MidiDriver.hpp"
@@ -34,9 +35,15 @@ class Machine;
class SMFDriver : public Raul::SMFWriter,
public boost::enable_shared_from_this<SMFDriver> {
public:
- SharedPtr<Machine> learn(const Glib::ustring& uri, unsigned track=1);
+ SharedPtr<Machine> learn(const Glib::ustring& uri);
+ SharedPtr<Machine> learn(const Glib::ustring& uri, unsigned track);
void run(SharedPtr<Machine> machine, Raul::BeatTime max_time);
+
+private:
+ void learn_track(SharedPtr<Machine> machine,
+ Raul::SMFReader& reader,
+ unsigned track);
};