diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /gtk2_ardour/main.cc | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index f55405a84d..da2677b296 100644 --- 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); @@ -530,6 +521,7 @@ int main (int argc, char *argv[]) ui->run (text_receiver); Gtkmm2ext::Application::instance()->cleanup(); + delete ui; ui = 0; ARDOUR::cleanup (); |