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/ardour_ui.cc | |
| parent | e711dfae12a3922476f5ff39c6b015d6617ed16c (diff) | |
| parent | 7a431f892ec6e7e2283885c474b680081c983762 (diff) | |
fix merge issues with master
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ec3f0becea..81a5b2c580 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -290,21 +290,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) /* lets get this party started */ - try { - if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) { - throw failed_constructor (); - } - - setup_gtk_ardour_enums (); - setup_profile (); + setup_gtk_ardour_enums (); + setup_profile (); - SessionEvent::create_per_thread_pool ("GUI", 512); - - } catch (failed_constructor& err) { - error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg; - // pass it on up - throw; - } + SessionEvent::create_per_thread_pool ("GUI", 512); /* we like keyboards */ |