X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fglobals.cc;h=e68e6f08e30517b8d1ff12bb11d98499bae5be85;hb=bc487bb4b02a9780938d6cf8528c888e59161aa9;hp=b2ad67d0538ccce16a2c25464274cae3e7df7057;hpb=2f5c4c29c6d60b172676a0f79c542d0ff085a9f6;p=ardour.git

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index b2ad67d053..e68e6f08e3 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -80,7 +80,6 @@
 #include "pbd/fpu.h"
 #include "pbd/file_utils.h"
 #include "pbd/enumwriter.h"
-#include "pbd/basename.h"
 
 #include "midi++/port.h"
 #include "midi++/mmc.h"
@@ -97,6 +96,7 @@
 #include "ardour/event_type_map.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
+#include "ardour/midi_ui.h"
 #include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
 #include "ardour/operations.h"
@@ -513,6 +513,22 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 #endif
 	(void) EventTypeMap::instance();
 
+	ControlProtocolManager::instance().discover_control_protocols ();
+
+	/* for each control protocol, check for a request buffer factory method
+	   and if it exists, store it in the EventLoop list of such
+	   methods. This allows the relevant threads to register themselves
+	   with EventLoops so that signal emission can be RT-safe.
+	*/
+
+	ControlProtocolManager::instance().register_request_buffer_factories ();
+	/* it would be nice if this could auto-register itself in the
+	   constructor, since MidiControlUI is a singleton, but it can't be
+	   created until after the engine is running. Therefore we have to
+	   explicitly register it here.
+	*/
+	EventLoop::register_request_buffer_factory (X_("midiUI"), MidiControlUI::request_factory);
+
         ProcessThread::init ();
 	/* the + 4 is a bit of a handwave. i don't actually know
 	   how many more per-thread buffer sets we need above
@@ -553,8 +569,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 void
 ARDOUR::init_post_engine ()
 {
-	ControlProtocolManager::instance().discover_control_protocols ();
-
 	XMLNode* node;
 	if ((node = Config->control_protocol_state()) != 0) {
 		ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
@@ -593,31 +607,6 @@ ARDOUR::cleanup ()
 	return;
 }
 
-void
-ARDOUR::find_bindings_files (map<string,string>& files)
-{
-	vector<std::string> found;
-	Searchpath spath = ardour_config_search_path();
-
-	if (getenv ("ARDOUR_SAE")) {
-		find_files_matching_pattern (found, spath, "*SAE-*.bindings");
-	} else {
-		find_files_matching_pattern (found, spath, "*.bindings");
-	}
-
-	if (found.empty()) {
-		return;
-	}
-
-	for (vector<std::string>::iterator x = found.begin(); x != found.end(); ++x) {
-		std::string path(*x);
-		pair<string,string> namepath;
-		namepath.second = path;
-		namepath.first = PBD::basename_nosuffix (path);
-		files.insert (namepath);
-	}
-}
-
 bool
 ARDOUR::no_auto_connect()
 {