Move initialization of libardour from ARDOUR_UI class into main()

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 86e838d122357f5c55b710512932a52c21dc1892..e3e97d8d94a90b50b9af7998c80c3296b4c7bef2 100644 (file)
--- 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 21e534397976b39930a1e02fd8c7f3fb2dc21a55..2e5d87b598e7ab169cf07c8c47cd0ec8fa3ed95e 100644 (file)
--- 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;
        }