diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/main.cc | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index ef96423fb5..dfa0bda945 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -483,10 +483,6 @@ int main (int argc, char *argv[]) exit (1); } - if (curvetest_file) { - return curvetest (curvetest_file); - } - cout << PROGRAM_NAME << VERSIONSTRING << _(" (built using ") @@ -514,7 +510,14 @@ int main (int argc, char *argv[]) /* some GUI objects need this */ - PBD::ID::init (); + if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) { + error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg; + exit (1); + } + + if (curvetest_file) { + return curvetest (curvetest_file); + } #ifndef WIN32 if (::signal (SIGPIPE, sigpipe_handler)) { |