diff options
| author | David Robillard <d@drobilla.net> | 2007-02-11 01:26:07 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-02-11 01:26:07 +0000 |
| commit | da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74 (patch) | |
| tree | 8371f2d2e46925df9337be9b578cfb74d671d285 /src/main.cpp | |
| parent | cee33ba4c0859b117be94df6ccbf3eb756a850af (diff) | |
| download | machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.tar.gz machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.tar.bz2 machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.zip | |
Moved Maid from Ingen to Raul.
Working machina MIDI learn, fixes, etc, etc.
git-svn-id: http://svn.drobilla.net/lad/machina@302 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/main.cpp b/src/main.cpp index e4dcbf2..d3a0e57 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,6 +24,7 @@ #include "machina/Loader.hpp" #include "machina/JackDriver.hpp" #include "machina/JackNodeFactory.hpp" +#include "machina/MidiAction.hpp" using namespace std; using namespace Machina; @@ -55,6 +56,8 @@ main(int argc, char** argv) SharedPtr<JackDriver> driver(new JackDriver()); SharedPtr<NodeFactory> factory(new JackNodeFactory(driver)); + MidiAction::set_driver(driver); + Loader l(factory); SharedPtr<Machine> m = l.load(argv[1]); @@ -75,24 +78,3 @@ main(int argc, char** argv) return 0; } - - /* - Machine m(1); - - Node* n1 = create_debug_node("1", 1); - Node* n2 = create_debug_node("2", 10); - - m.initial_node()->add_outgoing_edge(new Edge(n1)); - n1->add_outgoing_edge(new Edge(n2)); - n2->add_outgoing_edge(new Edge(m.initial_node())); - */ - - /* - Timestamp t = 0; - - while (t < 4000) { - m->run(1000); - t += 1000; - } - */ - |