make meter point button work again, and allow momentary button action to work again

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index dd4bcab9195d94c03259f87d7b5dd15d22ad5578..7c57b7535b1c548696ae5c423705585ee16c17a2 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,29 +18,30 @@
 */
 
 #include <cstdlib>
+#include <signal.h>
 
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
-#include <pbd/textreceiver.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/pthread_utils.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
+#include "pbd/textreceiver.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/pthread_utils.h"
 
 #include <jack/jack.h>
 
-#include <ardour/version.h>
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/session_utils.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/svn_revision.h"
+#include "ardour/version.h"
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/session_utils.h"
+#include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
-#include "../svn_revision.h"
 #include "version.h"
 #include "utils.h"
 #include "ardour_ui.h"
@@ -49,6 +50,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
 using namespace ARDOUR;
@@ -116,7 +118,10 @@ fixup_bundle_environment ()
        Glib::ustring path;
        const char *cstr = getenv ("PATH");
 
-       /* ensure that we find any bundled executables (e.g. JACK) */
+       /* ensure that we find any bundled executables (e.g. JACK),
+          and find them before any instances of the same name
+          elsewhere in PATH
+       */
 
        path = dir_path;
        if (cstr) {
@@ -147,12 +152,18 @@ fixup_bundle_environment ()
        setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1);
        setenv ("ARDOUR_DATA_PATH", path.c_str(), 1);
 
+       path = dir_path;
+       path += "/../Resources";
+       setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1);
+
        cstr = getenv ("LADSPA_PATH");
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Plugins";
        
        setenv ("LADSPA_PATH", path.c_str(), 1);
@@ -161,8 +172,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Frameworks";
        
        setenv ("VAMP_PATH", path.c_str(), 1);
@@ -171,8 +184,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Surfaces";
        
        setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
@@ -181,8 +196,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Plugins";
        
        setenv ("LV2_PATH", path.c_str(), 1);
@@ -205,6 +222,13 @@ fixup_bundle_environment ()
           actually exists ...
        */
 
+       try {
+               sys::create_directories (user_config_directory ());
+       }
+       catch (const sys::filesystem_error& ex) {
+               error << _("Could not create user configuration directory") << endmsg;
+       }
+       
        sys::path pangopath = user_config_directory();
        pangopath /= "pango.rc";
        path = pangopath.to_string();
@@ -212,6 +236,7 @@ fixup_bundle_environment ()
        std::ofstream pangorc (path.c_str());
        if (!pangorc) {
                error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+               return;
        } else {
                pangorc << "[Pango]\nModuleFiles=";
 
@@ -221,6 +246,7 @@ fixup_bundle_environment ()
                pangopath /= "pango.modules";
                        
                pangorc << pangopath.to_string() << endl;
+
                pangorc.close ();
 
                setenv ("PANGO_RC_FILE", path.c_str(), 1);
@@ -256,7 +282,16 @@ fixup_bundle_environment ()
 
 #endif
 
+static void
+sigpipe_handler (int sig)
+{
+       cerr << _("SIGPIPE received - JACK has probably died") << endl;
+}
+
 #ifdef VST_SUPPORT
+
+extern int gui_init (int* argc, char** argv[]);
+
 /* this is called from the entry point of a wine-compiled
    executable that is linked against gtk2_ardour built
    as a shared library.
@@ -276,6 +311,13 @@ int main (int argc, char *argv[])
         Glib::thread_init();
        gtk_set_locale ();
 
+#ifdef VST_SUPPORT
+       /* this does some magic that is needed to make GTK and Wine's own
+          X11 client interact properly.
+       */
+       gui_init (&argc, &argv);
+#endif
+
        (void) bindtextdomain (PACKAGE, localedir);
        /* our i18n translations are all in UTF-8, so make sure
           that even if the user locale doesn't specify UTF-8,
@@ -303,8 +345,8 @@ int main (int argc, char *argv[])
        
        cout << _("Ardour/GTK ") 
             << VERSIONSTRING
-            << _("\n   (built using ")
-            << ardour_svn_revision
+            << _(" (built using ")
+            << svn_revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__ 
 #endif
@@ -330,6 +372,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) {