diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-09 21:47:16 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-08-13 20:15:47 +1000 |
| commit | de4b24b162a2fccd6049d14eb092276fd2d4f849 (patch) | |
| tree | 247cb9419a289c61825321f9e38859bd3e64ccd5 /gtk2_ardour | |
| parent | 9d340af10da0bdb4e20681918dac6dde987c8e5e (diff) | |
Move initialization of libardour from ARDOUR_UI class into main()
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 17 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 5 |
2 files changed, 8 insertions, 14 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 86e838d122..e3e97d8d94 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 */ diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 21e5343979..2e5d87b598 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -515,6 +515,11 @@ int main (int argc, char *argv[]) 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 (::signal (SIGPIPE, sigpipe_handler)) { cerr << _("Cannot xinstall SIGPIPE error handler") << endl; } |