#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>
extern void set_language_preference (); // cocoacarbon.mm
void
-fixup_bundle_environment ()
+fixup_bundle_environment (int, char* [])
{
if (!getenv ("ARDOUR_BUNDLED")) {
return;
setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
- cstr = getenv ("LV2_PATH");
+ cstr = getenv ("ARDOUR_PANNER_PATH");
if (cstr) {
path = cstr;
path += ':';
path = "";
}
path += dir_path;
- path += "/../Plugins";
-
- setenv ("LV2_PATH", path.c_str(), 1);
+ path += "/lib/panners";
+
+ setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1);
path = dir_path;
path += "/../Frameworks/clearlooks";
setenv ("GTK_PATH", path.c_str(), 1);
+ /* unset GTK_RC_FILES so that we only load the RC files that we define
+ */
+
+ unsetenv ("GTK_RC_FILES");
+
if (!ARDOUR::translations_are_disabled ()) {
path = dir_path;
#else
void
-fixup_bundle_environment (int argc, char* argv[])
+fixup_bundle_environment (int /*argc*/, char* argv[])
{
if (!getenv ("ARDOUR_BUNDLED")) {
return;
const char *cstr = getenv ("PATH");
Glib::ustring userconfigdir = user_config_directory().to_string();
- cerr << "Ardour: bundle root = " << dir_path << endl;
-
/* ensure that we find any bundled executables (e.g. JACK),
and find them before any instances of the same name
elsewhere in PATH
setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
- cstr = getenv ("LV2_PATH");
+ cstr = getenv ("ARDOUR_PANNER_PATH");
if (cstr) {
path = cstr;
path += ':';
path = "";
}
path += dir_path;
- path += "/lib/plugins";
+ path += "/lib/panners";
- setenv ("LV2_PATH", path.c_str(), 1);
+ setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1);
path = dir_path;
path += "/lib/clearlooks";
setenv ("GTK_PATH", path.c_str(), 1);
+ /* unset GTK_RC_FILES so that we only load the RC files that we define
+ */
+
+ unsetenv ("GTK_RC_FILES");
+
if (!ARDOUR::translations_are_disabled ()) {
path = dir_path;
path += "/share/locale";
int main (int argc, char *argv[])
#endif
{
- fixup_bundle_environment ();
+ fixup_bundle_environment (argc, argv);
- if (!Glib::thread_supported())
+ if (!Glib::thread_supported()) {
Glib::thread_init();
+ }
gtk_set_locale ();
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);
}