diff options
author | David Robillard <d@drobilla.net> | 2013-01-11 21:07:26 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-11 21:07:26 +0000 |
commit | bef1c2ea010da638ffbb437c37a6d32ddc99b568 (patch) | |
tree | 3c40f06df385e40edd512247eda23b1f650623df /src/gui/main.cpp | |
parent | d88a8a0a01baff2c4038c315672c6c670361b82c (diff) | |
download | machina-bef1c2ea010da638ffbb437c37a6d32ddc99b568.tar.gz machina-bef1c2ea010da638ffbb437c37a6d32ddc99b568.tar.bz2 machina-bef1c2ea010da638ffbb437c37a6d32ddc99b568.zip |
Bring Machina back into the fold (fix #844).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4921 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/main.cpp')
-rw-r--r-- | src/gui/main.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 6db973c..676e3b8 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -64,8 +64,11 @@ main(int argc, char** argv) } #endif + Raul::Forge forge; + if (!machine) - machine = SharedPtr<Machine>(new Machine(TimeUnit(TimeUnit::BEATS, 19200))); + machine = SharedPtr<Machine>( + new Machine(forge, TimeUnit(TimeUnit::BEATS, 19200))); std::string driver_name = "smf"; #ifdef HAVE_JACK @@ -73,8 +76,8 @@ main(int argc, char** argv) #endif // Build engine - SharedPtr<Driver> driver(Engine::new_driver(driver_name, machine)); - SharedPtr<Engine> engine(new Engine(driver, rdf_world)); + SharedPtr<Driver> driver(Engine::new_driver(forge, driver_name, machine)); + SharedPtr<Engine> engine(new Engine(forge, driver, rdf_world)); Gtk::Main app(argc, argv); |