Hack round a maybe delightful (for some values of delightful) and certainly evil...

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index c39a8f26dfd16a418b889bfbb788fecfae07d4ef..a35cd1f3e7735a00ed3c10338319e14761b2a047 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -31,6 +31,9 @@
 #include "pbd/textreceiver.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/pthread_utils.h"
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+#include "pbd/boost_debug.h"
+#endif
 
 #include <jack/jack.h>
 
@@ -222,18 +225,6 @@ fixup_bundle_environment (int, char* [])
        
        setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1);
 
-       cstr = getenv ("LV2_PATH");
-       if (cstr) {
-               path = cstr;
-               path += ':';
-       } else {
-               path = "";
-       }
-       path += dir_path;
-       path += "/../Plugins";
-
-       setenv ("LV2_PATH", path.c_str(), 1);
-
        path = dir_path;
        path += "/../Frameworks/clearlooks";
 
@@ -420,18 +411,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        
        setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1);
 
-       cstr = getenv ("LV2_PATH");
-       if (cstr) {
-               path = cstr;
-               path += ':';
-       } else {
-               path = "";
-       }
-       path += dir_path;
-       path += "/lib/plugins";
-       
-       setenv ("LV2_PATH", path.c_str(), 1);
-
        path = dir_path;
        path += "/lib/clearlooks";
 
@@ -559,8 +538,9 @@ int main (int argc, char *argv[])
 {
        fixup_bundle_environment (argc, argv);
 
-       if (!Glib::thread_supported())
+       if (!Glib::thread_supported()) {
                Glib::thread_init();
+        }
 
        gtk_set_locale ();
 
@@ -588,6 +568,12 @@ int main (int argc, char *argv[])
        text_receiver.listen_to (fatal);
        text_receiver.listen_to (warning);
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+        if (getenv ("BOOST_DEBUG")) {
+                boost_debug_shared_ptr_show_live_debugging (true);
+        }
+#endif
+
        if (parse_opts (argc, argv)) {
                exit (1);
        }
@@ -611,7 +597,7 @@ int main (int argc, char *argv[])
        }
 
        if (no_splash) {
-               cerr << _("Copyright (C) 1999-2010 Paul Davis") << endl
+               cerr << _("Copyright (C) 1999-2011 Paul Davis") << endl
                     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
                     << endl
                     << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl