diff options
| author | Doug McLain <doug@nostar.net> | 2006-11-02 02:17:50 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2006-11-02 02:17:50 +0000 |
| commit | c9d145246276b7632b3762c426c24608bcd57560 (patch) | |
| tree | 158657804850f4d33a41c278a99106a33609b29b | |
| parent | bc3afc09e816853ca3edbfff37dc2c90e2808595 (diff) | |
Removed LADSPA_PATH from ardev_common.sh, and added the MAC OSX path to list of default directories. Setting LADSPA_PATH in the script was stopping the default paths from being set
git-svn-id: svn://localhost/ardour2/trunk@1050 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 2 | ||||
| -rwxr-xr-x | gtk2_ardour/ardev_common.sh | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour2_ui.rc | 6 | ||||
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 5 |
4 files changed, 4 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index 3959ef68ba..83ee2c5d7f 100644 --- a/SConstruct +++ b/SConstruct @@ -472,7 +472,7 @@ libraries['flac'] = conf.Finish () libraries['boost'] = LibraryInfo () conf = Configure (libraries['boost']) -if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == 0: +if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False: print "Boost header files do not appear to be installed." sys.exit (1) diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh index 165db68369..b43711ed3e 100755 --- a/gtk2_ardour/ardev_common.sh +++ b/gtk2_ardour/ardev_common.sh @@ -8,6 +8,3 @@ export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:l # DYLD_LIBRARY_PATH is for darwin. export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH - -# LADSPA_PATH for OSX -export LADSPA_PATH=$LADSPA_PATH:/Library/Audio/Plug-Ins/LADSPA diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index f0a09778d1..7077d20ca9 100644 --- a/gtk2_ardour/ardour2_ui.rc +++ b/gtk2_ardour/ardour2_ui.rc @@ -110,12 +110,6 @@ style "default_base" = "medium_text" base[INSENSITIVE] = "#4c5159" base[SELECTED] = { 0.25, 0.25, 0.25 } - engine "clearlooks" { - menubarstyle = 2 # 0 = flat, 1 = sunken, 2 = flat gradient - menuitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) - listviewitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat - } } style "base_frame" diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index b44bd05b9a..34893182ef 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -83,7 +83,7 @@ PluginManager::PluginManager () } refresh (); - + cerr << "ladspa_path = " << ladspa_path << endl;//DEBUG if (_manager == 0) { _manager = this; } @@ -106,7 +106,8 @@ PluginManager::ladspa_refresh () _ladspa_plugin_info.clear (); if (ladspa_path.length() == 0) { - ladspa_path = "/usr/local/lib64/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/lib/ladspa"; + ladspa_path = "/usr/local/lib64/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/lib/ladspa:/Library/Audio/Plug-Ins/LADSPA"; + cerr << "ladspa_path set" << endl; //DEBUG } ladspa_discover_from_path (ladspa_path); |