diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
commit | c86210a9d5bdb7b36ad58552a1f99f53d48781b3 (patch) | |
tree | 6ab06935a1e2bc4ef6a4448dd01b09f5b2628c66 /gtk2_ardour/main.cc | |
parent | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (diff) |
merge 2.0-ongoing into 3.0 @ 3581 - 3710
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
-rw-r--r-- | gtk2_ardour/main.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index abbf216eea..0edf450cd1 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -18,6 +18,7 @@ */ #include <cstdlib> +#include <signal.h> #include <sigc++/bind.h> #include <gtkmm/settings.h> @@ -252,6 +253,7 @@ fixup_bundle_environment () path += "/../Resources/gdk-pixbuf.loaders"; setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1); + cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl; if (getenv ("ARDOUR_WITH_JACK")) { // JACK driver dir @@ -265,6 +267,12 @@ fixup_bundle_environment () #endif +static void +sigpipe_handler (int sig) +{ + cerr << _("SIGPIPE received - JACK has probably died") << endl; +} + #ifdef VST_SUPPORT /* this is called from the entry point of a wine-compiled executable that is linked against gtk2_ardour built @@ -278,9 +286,12 @@ int main (int argc, char *argv[]) { vector<Glib::ustring> null_file_list; + cerr << "here we go\n"; + #ifdef __APPLE__ fixup_bundle_environment (); #endif + cerr << "just did it\n"; Glib::thread_init(); gtk_set_locale (); @@ -339,6 +350,10 @@ int main (int argc, char *argv[]) PBD::ID::init (); + if (::signal (SIGPIPE, sigpipe_handler)) { + cerr << _("Cannot install SIGPIPE error handler") << endl; + } + try { ui = new ARDOUR_UI (&argc, &argv); } catch (failed_constructor& err) { |