projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on session-load: skip output-change-handler until IOs are restored
[ardour.git]
/
libs
/
ardour
/
control_protocol_search_path.cc
diff --git
a/libs/ardour/control_protocol_search_path.cc
b/libs/ardour/control_protocol_search_path.cc
index a74195b4c0718b9b09c028281e3b546bc14184f9..254cd03fe94c23fb9a91c4460d6b76d97ea4c706 100644
(file)
--- a/
libs/ardour/control_protocol_search_path.cc
+++ b/
libs/ardour/control_protocol_search_path.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2007 Tim Mayberry
+ Copyright (C) 2007 Tim Mayberry
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,6
+17,8
@@
*/
*/
+#include <iostream>
+
#include <glibmm/miscutils.h>
#include "ardour/control_protocol_search_path.h"
#include <glibmm/miscutils.h>
#include "ardour/control_protocol_search_path.h"
@@
-34,20
+36,11
@@
namespace ARDOUR {
SearchPath
control_protocol_search_path ()
{
SearchPath
control_protocol_search_path ()
{
- bool surfaces_path_defined = false;
- SearchPath spath_env(Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
-
- if (surfaces_path_defined)
- {
- return spath_env;
- }
-
SearchPath spath(user_config_directory ());
SearchPath spath(user_config_directory ());
-
- spath += ardour_module_directory ();
-
- spath.add_subdirectory_to_paths(surfaces_dir_name);
-
+ spath += ardour_dll_directory ();
+ spath.add_subdirectory_to_paths (surfaces_dir_name);
+
+ spath += SearchPath(Glib::getenv(surfaces_env_variable_name));
return spath;
}
return spath;
}