pulling trunk

[ardour.git] / libs / ardour / ardour / control_protocol_manager.h

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index c19649e38bddc4e19cda6b474e5b08ce0e112a4e..03b21a299cdb5e54f81f6920373dc7183bcf2602 100644 (file)
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -6,7 +6,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <ardour/stateful.h>
 
@@ -22,6 +22,7 @@ struct ControlProtocolInfo {
     std::string name;
     std::string path;
     bool requested;
+    bool mandatory;
 };
 
  class ControlProtocolManager : public sigc::trackable, public Stateful
@@ -35,6 +36,7 @@ struct ControlProtocolInfo {
        void set_session (Session&);
        void discover_control_protocols (std::string search_path);
        void foreach_known_protocol (sigc::slot<void,const ControlProtocolInfo*>);
+       void load_mandatory_protocols ();
 
        ControlProtocol* instantiate (ControlProtocolInfo&);
        int              teardown (ControlProtocolInfo&);
@@ -50,7 +52,7 @@ struct ControlProtocolInfo {
        static ControlProtocolManager* _instance;
 
        Session* _session;
-       PBD::Lock protocols_lock;
+       Glib::Mutex protocols_lock;
        std::list<ControlProtocol*>    control_protocols;
 
        void drop_session ();