From 48f7a10b69327e47ff72f6c90244af58b5c00a5e Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 23 Mar 2011 14:09:48 +0000 Subject: [PATCH] tracking down why alpha binaries don't find control surfaces git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9189 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/control_protocol_search_path.cc | 13 +++++++------ libs/ardour/panner_search_path.cc | 5 ++++- tools/linux_packaging/ardour.sh.in | 8 +------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc index 7cdf75a44..a728b3c10 100644 --- a/libs/ardour/control_protocol_search_path.cc +++ b/libs/ardour/control_protocol_search_path.cc @@ -17,6 +17,7 @@ */ +#include #include #include "ardour/control_protocol_search_path.h" @@ -35,18 +36,18 @@ SearchPath control_protocol_search_path () { bool surfaces_path_defined = false; - SearchPath spath_env(Glib::getenv(surfaces_env_variable_name, surfaces_path_defined)); + SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined)); - if (surfaces_path_defined) - { + if (surfaces_path_defined) { return spath_env; } - SearchPath spath(user_config_directory ()); + SearchPath spath (user_config_directory ()); - spath += ardour_module_directory (); + std::cerr << "for CPS, AMD = " << ardour_module_directory().to_string() << std::endl; - spath.add_subdirectory_to_paths(surfaces_dir_name); + spath += ardour_module_directory (); + spath.add_subdirectory_to_paths (surfaces_dir_name); return spath; } diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc index 559e306ca..434e9461e 100644 --- a/libs/ardour/panner_search_path.cc +++ b/libs/ardour/panner_search_path.cc @@ -17,6 +17,7 @@ */ +#include #include #include "ardour/panner_search_path.h" @@ -41,8 +42,10 @@ panner_search_path () return spath_env; } - SearchPath spath(user_config_directory ()); + SearchPath spath (user_config_directory ()); + std::cerr << "for panner, AMD = " << ardour_module_directory().to_string() << std::endl; + spath += ardour_module_directory (); spath.add_subdirectory_to_paths(panner_dir_name); diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 72c70380c..89a6f4c49 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -7,13 +7,7 @@ while [ $# -gt 0 ] ; do -d) DEBUG="T"; shift ;; - *) - #catch all for unknown arguments - echo "" - echo "!!! ERROR !!! - Unknown argument $1" - echo "" - exit 1 - ;; + *) break;; esac done -- 2.11.4.GIT