From a716b2c0571f5bdcd817835cecb30cb7a4c745e0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 17 Mar 2007 03:15:44 +0000 Subject: Nicer automata diagrams from machina2dot.py. Added midi2machina program. git-svn-id: http://svn.drobilla.net/lad/machina@362 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/SMFDriver.cpp | 8 ++------ src/engine/machina/SMFDriver.hpp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/engine') diff --git a/src/engine/SMFDriver.cpp b/src/engine/SMFDriver.cpp index 70756d1..cdf2ad7 100644 --- a/src/engine/SMFDriver.cpp +++ b/src/engine/SMFDriver.cpp @@ -38,10 +38,8 @@ namespace Machina { * @return the resulting machine. */ SharedPtr -SMFDriver::learn(const Glib::ustring& uri, unsigned track, Raul::BeatTime max_duration) +SMFDriver::learn(const string& filename, unsigned track, Raul::BeatTime max_duration) { - const string filename = Glib::filename_from_uri(uri); - SharedPtr m(new Machine()); Raul::SMFReader reader; @@ -64,10 +62,8 @@ SMFDriver::learn(const Glib::ustring& uri, unsigned track, Raul::BeatTime max_du * This will result in a disjoint subgraph in the machine, one for each track. */ SharedPtr -SMFDriver::learn(const Glib::ustring& uri, Raul::BeatTime max_duration) +SMFDriver::learn(const string& filename, Raul::BeatTime max_duration) { - const string filename = Glib::filename_from_uri(uri); - SharedPtr m(new Machine()); Raul::SMFReader reader; diff --git a/src/engine/machina/SMFDriver.hpp b/src/engine/machina/SMFDriver.hpp index 17c196e..3e74726 100644 --- a/src/engine/machina/SMFDriver.hpp +++ b/src/engine/machina/SMFDriver.hpp @@ -35,8 +35,8 @@ class Machine; class SMFDriver : public Raul::SMFWriter, public boost::enable_shared_from_this { public: - SharedPtr learn(const Glib::ustring& uri, Raul::BeatTime max_duration=0); - SharedPtr learn(const Glib::ustring& uri, unsigned track, Raul::BeatTime max_duration=0); + SharedPtr learn(const std::string& filename, Raul::BeatTime max_duration=0); + SharedPtr learn(const std::string& filename, unsigned track, Raul::BeatTime max_duration=0); void run(SharedPtr machine, Raul::BeatTime max_time); -- cgit v1.2.1