'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS...

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index f55405a84da856b20b2d57b93fc61d120614a365..b9f3040ea08bfcb97b2382aa61277c59b7a12bd5 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -37,8 +37,6 @@
 #include "pbd/boost_debug.h"
 #endif
 
-#include <jack/jack.h>
-
 #include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/ardour.h"
@@ -81,17 +79,10 @@ static const char* localedir = LOCALEDIR;
 void
 gui_jack_error ()
 {
-       MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
+       MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME),
                           false,
                           Gtk::MESSAGE_INFO,
                           Gtk::BUTTONS_NONE);
-       win.set_secondary_text(string_compose (_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"%1\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."), PROGRAM_NAME));
 
        win.add_button (Stock::QUIT, RESPONSE_CLOSE);
        win.set_default_response (RESPONSE_CLOSE);
@@ -515,7 +506,7 @@ int main (int argc, char *argv[])
                return curvetest (curvetest_file);
        }
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        if (::signal (SIGPIPE, sigpipe_handler)) {
                cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
        }
@@ -530,6 +521,7 @@ int main (int argc, char *argv[])
 
        ui->run (text_receiver);
        Gtkmm2ext::Application::instance()->cleanup();
+       delete ui;
        ui = 0;
 
        ARDOUR::cleanup ();