don't actually use a method from libardourcp inside libardour; use a PBD::Signal...

[ardour.git] / libs / surfaces / control_protocol / control_protocol.cc

diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index 8c2a1217790063cd4650d6debddda2a54149f41e..e094e9b6cc4a723c3410d4586962cb54bd812771 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -18,8 +18,10 @@
 
 */
 
+#include "pbd/convert.h"
 #include "pbd/error.h"
 
+#include "ardour/control_protocol_manager.h"
 #include "ardour/gain_control.h"
 #include "ardour/session.h"
 #include "ardour/record_enable_control.h"
@@ -55,13 +57,12 @@ PBD::Signal1<void,boost::shared_ptr<ARDOUR::Stripable> > ControlProtocol::Toggle
 PBD::Signal1<void,boost::shared_ptr<ARDOUR::Stripable> > ControlProtocol::RemoveStripableFromSelection;
 PBD::Signal0<void>          ControlProtocol::ClearStripableSelection;
 
-PBD::Signal1<void,StripableNotificationListPtr> ControlProtocol::StripableSelectionChanged;
-
-Glib::Threads::Mutex ControlProtocol::first_selected_mutex;
+Glib::Threads::Mutex ControlProtocol::special_stripable_mutex;
 boost::weak_ptr<Stripable> ControlProtocol::_first_selected_stripable;
+boost::weak_ptr<Stripable> ControlProtocol::_leftmost_mixer_stripable;
 StripableNotificationList ControlProtocol::_last_selected;
-bool ControlProtocol::selection_connected = false;
 PBD::ScopedConnection ControlProtocol::selection_connection;
+bool ControlProtocol::selection_connected = false;
 
 const std::string ControlProtocol::state_node_name ("Protocol");
 
@@ -72,8 +73,7 @@ ControlProtocol::ControlProtocol (Session& s, string str)
 {
        if (!selection_connected) {
                /* this is all static, connect it only once (and early), for all ControlProtocols */
-
-               StripableSelectionChanged.connect_same_thread (selection_connection, boost::bind (&ControlProtocol::stripable_selection_changed, _1));
+               ControlProtocolManager::StripableSelectionChanged.connect_same_thread (selection_connection, boost::bind (&ControlProtocol::notify_stripable_selection_changed, _1));
                selection_connected = true;
        }
 }
@@ -294,7 +294,8 @@ ControlProtocol::route_set_soloed (uint32_t table_index, bool yn)
        boost::shared_ptr<Route> r = route_table[table_index];
 
        if (r != 0) {
-               r->solo_control()->set_value (yn ? 1.0 : 0.0, Controllable::UseGroup);
+               r->solo_control()->set_value (yn ? 1.0 : 0.0, Controllable::UseGroup); // XXX does not propagate
+               //_session->set_control (r->solo_control(), yn ? 1.0 : 0.0, Controllable::UseGroup); // << correct way, needs a session ptr
        }
 }
 
@@ -325,8 +326,8 @@ ControlProtocol::get_state ()
 {
        XMLNode* node = new XMLNode (state_node_name);
 
-       node->add_property ("name", _name);
-       node->add_property ("feedback", get_feedback() ? "yes" : "no");
+       node->set_property ("name", _name);
+       node->set_property ("feedback", get_feedback());
 
        return *node;
 }
@@ -334,10 +335,9 @@ ControlProtocol::get_state ()
 int
 ControlProtocol::set_state (XMLNode const & node, int /* version */)
 {
-       const XMLProperty* prop;
-
-       if ((prop = node.property ("feedback")) != 0) {
-               set_feedback (string_is_affirmative (prop->value()));
+       bool feedback;
+       if (node.get_property ("feedback", feedback)) {
+               set_feedback (feedback);
        }
 
        return 0;
@@ -346,26 +346,40 @@ ControlProtocol::set_state (XMLNode const & node, int /* version */)
 boost::shared_ptr<Stripable>
 ControlProtocol::first_selected_stripable ()
 {
-       Glib::Threads::Mutex::Lock lm (first_selected_mutex);
+       Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
        return _first_selected_stripable.lock();
 }
 
+boost::shared_ptr<Stripable>
+ControlProtocol::leftmost_mixer_stripable ()
+{
+       Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
+       return _leftmost_mixer_stripable.lock();
+}
+
+void
+ControlProtocol::set_leftmost_mixer_stripable (boost::shared_ptr<Stripable> s)
+{
+       Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
+       _leftmost_mixer_stripable = s;
+}
+
 void
 ControlProtocol::set_first_selected_stripable (boost::shared_ptr<Stripable> s)
 {
-       Glib::Threads::Mutex::Lock lm (first_selected_mutex);
+       Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
        _first_selected_stripable = s;
 }
 
 void
-ControlProtocol::stripable_selection_changed (StripableNotificationListPtr sp)
+ControlProtocol::notify_stripable_selection_changed (StripableNotificationListPtr sp)
 {
        bool had_selection = !_last_selected.empty();
 
        _last_selected = *sp;
 
        {
-               Glib::Threads::Mutex::Lock lm (first_selected_mutex);
+               Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
 
                if (!_last_selected.empty()) {
                        if (!had_selection) {