faderport: simpler logic for master/monitor/other

When choosing master or monitor, do NOT save master or monitor as the pre_{master,monitor}_route under
any circumstances. This means that master/monitor choices do not stack, and just switch between them.

diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc
index 381f8931745b5d525555542fdad741131eb7cb10..a8f89380693fe4f6af2803f8dc82d31b88575469 100644 (file)
--- a/libs/surfaces/faderport/faderport.cc
+++ b/libs/surfaces/faderport/faderport.cc
@@ -769,6 +769,11 @@ FaderPort::set_current_route (boost::shared_ptr<Route> r)
 
        _current_route = r;
 
+       /* turn this off. It will be turned on back on in use_master() or
+          use_monitor() as appropriate.
+       */
+       button_info(Output).set_led_state (_output_port, false);
+
        if (_current_route) {
                _current_route->DropReferences.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::drop_current_route, this), this);
 

diff --git a/libs/surfaces/faderport/operations.cc b/libs/surfaces/faderport/operations.cc
index b25e449f5685d3f8d0f990bdf5c1beaf24242482..3c4d27a34504658f65b7756d86c6c30a61693d8e 100644 (file)
--- a/libs/surfaces/faderport/operations.cc
+++ b/libs/surfaces/faderport/operations.cc
@@ -102,15 +102,12 @@ FaderPort::use_master ()
                if (_current_route == r) {
                        r = pre_master_route.lock();
                        set_current_route (r);
-                       if (r == session->monitor_out()) {
-                               button_info(Output).set_led_state (_output_port, true);
-                               blinkers.push_back (Output);
-                       } else {
-                               button_info(Output).set_led_state (_output_port, false);
-                               blinkers.remove (Output);
-                       }
+                       button_info(Output).set_led_state (_output_port, false);
+                       blinkers.remove (Output);
                } else {
-                       pre_master_route = boost::weak_ptr<Route> (_current_route);
+                       if (_current_route != session->master_out() && _current_route != session->monitor_out()) {
+                               pre_master_route = boost::weak_ptr<Route> (_current_route);
+                       }
                        set_current_route (r);
                        button_info(Output).set_led_state (_output_port, true);
                        blinkers.remove (Output);
@@ -127,14 +124,12 @@ FaderPort::use_monitor ()
                if (_current_route == r) {
                        r = pre_monitor_route.lock();
                        set_current_route (r);
-                       if (r == session->master_out()) {
-                               button_info(Output).set_led_state (_output_port, true);
-                       } else {
-                               button_info(Output).set_led_state (_output_port, false);
-                       }
+                       button_info(Output).set_led_state (_output_port, false);
                        blinkers.remove (Output);
                } else {
-                       pre_monitor_route = boost::weak_ptr<Route> (_current_route);
+                       if (_current_route != session->master_out() && _current_route != session->monitor_out()) {
+                               pre_monitor_route = boost::weak_ptr<Route> (_current_route);
+                       }
                        set_current_route (r);
                        button_info(Output).set_led_state (_output_port, true);
                        blinkers.push_back (Output);