aboutsummaryrefslogtreecommitdiffstats
path: root/src/gui/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/main.cpp')
-rw-r--r--src/gui/main.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 7a70250..e87e29d 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -32,8 +32,9 @@ using namespace Machina;
int
main(int argc, char** argv)
{
- if ( ! Glib::thread_supported())
+ if (!Glib::thread_supported()) {
Glib::thread_init();
+ }
Sord::World rdf_world;
@@ -58,7 +59,7 @@ main(int argc, char** argv)
}
if (!machine) {
- cout << "Not a MIDI file. Attempting to load as Machina file." << endl;
+ cout << "Not MIDI, attempting to load machine" << endl;
machine = Loader(rdf_world).load(filename);
}
}
@@ -66,14 +67,15 @@ main(int argc, char** argv)
Raul::Forge forge;
- if (!machine)
+ if (!machine) {
machine = SharedPtr<Machine>(
- new Machine(TimeUnit(TimeUnit::BEATS, 19200)));
+ new Machine(TimeUnit(TimeUnit::BEATS, 19200)));
+ }
std::string driver_name = "smf";
- #ifdef HAVE_JACK
+ #ifdef HAVE_JACK
driver_name = "jack";
- #endif
+ #endif
// Build engine
SharedPtr<Driver> driver(Engine::new_driver(forge, driver_name, machine));
@@ -88,4 +90,3 @@ main(int argc, char** argv)
return 0;
}
-