summaryrefslogtreecommitdiff
path: root/libs/ardour/globals.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r--libs/ardour/globals.cc18
1 files changed, 17 insertions, 1 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 5fca7f07eb..a6f9d6b2e5 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -269,6 +269,11 @@ ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*s
/* singleton - first object is "it" */
new ControlProtocolManager ();
ControlProtocolManager::instance().discover_control_protocols (Session::control_protocol_path());
+
+ XMLNode* node;
+ if ((node = Config->control_protocol_state()) != 0) {
+ ControlProtocolManager::instance().set_state (*node);
+ }
BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
@@ -325,7 +330,7 @@ ARDOUR::get_user_ardour_path ()
}
string
-ARDOUR::get_system_ardour_path ()
+ARDOUR::get_system_data_path ()
{
string path;
@@ -335,6 +340,17 @@ ARDOUR::get_system_ardour_path ()
return path;
}
+string
+ARDOUR::get_system_module_path ()
+{
+ string path;
+
+ path += MODULE_DIR;
+ path += "/ardour2/";
+
+ return path;
+}
+
static string
find_file (string name, string dir, string subdir = "")
{