ardour/livetrax
13
0
Fork 0
Code

tracking down why alpha binaries don't find control surfaces

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9189 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-23 14:09:48 +00:00
parent 7178f031ba
commit e43b01535c
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/control_protocol_search_path.cc
View File

@ -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 ());
std::cerr << "for CPS, AMD = " << ardour_module_directory().to_string() << std::endl;
spath += ardour_module_directory ();
spath.add_subdirectory_to_paths(surfaces_dir_name);
spath.add_subdirectory_to_paths (surfaces_dir_name);
return spath;
}

5
libs/ardour/panner_search_path.cc
View File

@ -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);

8
tools/linux_packaging/ardour.sh.in
View File

@ -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