summaryrefslogtreecommitdiff
path: root/libs/ardour/session_state.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-04-24 22:45:19 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-04-24 22:45:19 +0000
commit028e1ebc4a392572cae586d0e9044a32b867cba4 (patch)
tree36d3a748486feb3f41575708bef8b153fef2cad4 /libs/ardour/session_state.cc
parent484debb45c5ea45bccf0f9cb05b1239a9c2244a3 (diff)
a) completely refactor abstract UI code
b) single-thread Tranzport implementation c) implement BasicUI to share functionality across multiple controllers d) various minor fixes here and there git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r--libs/ardour/session_state.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 6f1d20d17f..0cab0fd28d 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2293,7 +2293,7 @@ Session::template_dir ()
}
string
-Session::suffixed_search_path (string suffix)
+Session::suffixed_search_path (string suffix, bool data)
{
string path;
@@ -2301,7 +2301,12 @@ Session::suffixed_search_path (string suffix)
if (path[path.length()-1] != ':') {
path += ':';
}
- path += get_system_ardour_path();
+
+ if (data) {
+ path += get_system_data_path();
+ } else {
+ path += get_system_module_path();
+ }
vector<string> split_path;
@@ -2324,13 +2329,13 @@ Session::suffixed_search_path (string suffix)
string
Session::template_path ()
{
- return suffixed_search_path (X_("templates"));
+ return suffixed_search_path (X_("templates"), true);
}
string
Session::control_protocol_path ()
{
- return suffixed_search_path (X_("surfaces"));
+ return suffixed_search_path (X_("surfaces"), false);
}
int