Mackie Control: Don't show hidden routes.

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index ea26cfece8401353222d7395958336814b187ee9..66ab231141bfbdcf87608ff51e673539652f5829 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -298,11 +298,13 @@ MackieControlProtocol::get_sorted_routes()
                        if (route->route_group()) {
                                route->route_group()->set_active (true, this);
                        }
-                       sorted.push_back (route);
-                       remote_ids.insert (route->remote_control_id());
+                       if (! is_hidden(route)) {
+                               sorted.push_back (route);
+                               remote_ids.insert (route->remote_control_id());
+                       }
                        break;
                case AudioTracks:
-                       if (is_audio_track(route)) {
+                       if (is_audio_track(route) && !is_hidden(route)) {
                                if (route->route_group()) {
                                        route->route_group()->set_active (true, this);
                                }
@@ -319,7 +321,7 @@ MackieControlProtocol::get_sorted_routes()
                                }
 #endif                         
                        } else {
-                               if (!is_track(route)) {
+                               if (!is_track(route) && !is_hidden(route)) {
                                        if (route->route_group()) {
                                                route->route_group()->set_active (true, this);
                                        }
@@ -329,7 +331,7 @@ MackieControlProtocol::get_sorted_routes()
                        }
                        break;
                case MidiTracks:
-                       if (is_midi_track(route)) {
+                       if (is_midi_track(route) && !is_hidden(route)) {
                                if (route->route_group()) {
                                        route->route_group()->set_active (true, this);
                                }
@@ -340,7 +342,7 @@ MackieControlProtocol::get_sorted_routes()
                case Plugins:
                        break;
                case Auxes: // in ardour, for now aux and buss are same. for mixbus, see "Busses" case above
-                       if (!is_track(route)) {
+                       if (!is_track(route) && !is_hidden(route)) {
                                if (route->route_group()) {
                                        route->route_group()->set_active (true, this);
                                }
@@ -348,8 +350,8 @@ MackieControlProtocol::get_sorted_routes()
                                remote_ids.insert (route->remote_control_id());
                        }
                        break;
-               case Selected: // For example: a group
-                       if (selected(route)) {
+               case Selected: // For example: a group (this is USER)
+                       if (selected(route) && !is_hidden(route)) {
                                /* Selected may be a group in which case we want to
                                 * control each track separately.
                                 */
@@ -2219,6 +2221,12 @@ MackieControlProtocol::selected (boost::shared_ptr<Route> r) const
        return false;
 }
 
+bool
+MackieControlProtocol::is_hidden (boost::shared_ptr<Route> r) const
+{
+       return ((r->remote_control_id()) >>31) != 0;
+}
+
 boost::shared_ptr<Route>
 MackieControlProtocol::first_selected_route () const
 {

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index a5e23403dc69d2568017dce89a269d49f981b593..f5352731c551c3ded4b1110f2fd4666eb684bade 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -160,6 +160,7 @@ class MackieControlProtocol
        bool is_audio_track (boost::shared_ptr<ARDOUR::Route>) const;
        bool is_midi_track (boost::shared_ptr<ARDOUR::Route>) const;
        bool selected (boost::shared_ptr<ARDOUR::Route>) const;
+       bool is_hidden (boost::shared_ptr<ARDOUR::Route>) const;
        boost::shared_ptr<ARDOUR::Route> first_selected_route () const;
 
        void set_view_mode (ViewMode);