diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-14 13:10:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-14 13:10:59 -0400 |
| commit | 6bcdf4f0f106d0b83ed7f221f546c132585e19e7 (patch) | |
| tree | 1ebbd4c6a63943952cd9b4ec6a7adcc8ad506883 /gtk2_ardour/main.cc | |
| parent | e711dfae12a3922476f5ff39c6b015d6617ed16c (diff) | |
| parent | 7a431f892ec6e7e2283885c474b680081c983762 (diff) | |
fix merge issues with 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 e9b5da3e04..c8f8d76a98 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -478,10 +478,6 @@ int main (int argc, char *argv[]) exit (1); } - if (curvetest_file) { - return curvetest (curvetest_file); - } - cout << PROGRAM_NAME << VERSIONSTRING << _(" (built using ") @@ -509,7 +505,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); + } if (::signal (SIGPIPE, sigpipe_handler)) { cerr << _("Cannot xinstall SIGPIPE error handler") << endl; |