tracking down why alpha binaries don't find control surfaces

git-svn-id: svn://localhost/ardour2/branches/3.0@9189 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc
index 7cdf75a44137a6b646904a3a450b59619a1e318c..a728b3c10fde964cb28783860922982b628ba300 100644 (file)
--- a/libs/ardour/control_protocol_search_path.cc
+++ b/libs/ardour/control_protocol_search_path.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <iostream>
 #include <glibmm/miscutils.h>
 
 #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 559e306caa98ee1cb09e4cf9029dbc0ec51f1d7d..434e9461e23e5d15b3cf4a70175785d84a33ef7c 100644 (file)
--- a/libs/ardour/panner_search_path.cc
+++ b/libs/ardour/panner_search_path.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <iostream>
 #include <glibmm/miscutils.h>
 
 #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 72c70380c5ee10dd9834e9b8c522cf1526529620..89a6f4c4911f34e09f3cd19f5f825e2d68cc3cf3 100644 (file)
--- 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