remove cruft

[ardour.git] / libs / surfaces / mackie / surface.cc

diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 85ea7c97b11a8dd1f84f5a97aa791dc07a5c4f92..6941c68d29dbf93feedc292f6bfabcf6c87e9033 100644 (file)
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -25,6 +25,8 @@
 
 #include <glibmm/convert.h>
 
+#include "pbd/stacktrace.h"
+
 #include "midi++/port.h"
 
 #include "ardour/audioengine.h"
@@ -367,7 +369,9 @@ Surface::init_strips (uint32_t n)
 void
 Surface::master_monitor_may_have_changed ()
 {
-       setup_master ();
+       if (_number == _mcp.device_info().master_position()) {
+               setup_master ();
+       }
 }
 
 void
@@ -380,17 +384,26 @@ Surface::setup_master ()
        }
 
        if (!m) {
-               _master_fader->set_control (boost::shared_ptr<AutomationControl>());
+               if (_master_fader) {
+                       _master_fader->set_control (boost::shared_ptr<AutomationControl>());
+               }
                master_connection.disconnect ();
                return;
        }
 
        if (!_master_fader) {
-               _master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *groups["master"]));
-
                Groups::iterator group_it;
+               Group* master_group;
                group_it = groups.find("master");
 
+               if (group_it == groups.end()) {
+                       groups["master"] = master_group = new Group ("master");
+               } else {
+                       master_group = group_it->second;
+               }
+
+               _master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *master_group));
+
                DeviceInfo device_info = _mcp.device_info();
                GlobalButtonInfo master_button = device_info.get_global_button(Button::MasterFaderTouch);
                Button* bb = dynamic_cast<Button*> (Button::factory (
@@ -525,14 +538,6 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin
                turn_it_on ();
        }
 
-       if (_mcp.main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
-               /* user is doing a reset to unity gain but device sends a PB
-                * message in the middle of the touch on/off messages. Ignore
-                * it.
-                */
-               return;
-       }
-
        Fader* fader = faders[fader_id];
 
        if (fader) {
@@ -641,7 +646,7 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev
        }
 
        float delta = 0;
-       if (mcp().main_modifier_state() == MackieControlProtocol::MODIFIER_CONTROL) {
+       if (mcp().main_modifier_state() == MackieControlProtocol::MODIFIER_SHIFT) {
                delta = sign * (ticks / (float) 0xff);
        } else {
                delta = sign * (ticks / (float) 0x3f);
@@ -700,6 +705,13 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count
                }
                break;
 
+       case 0x06:
+               /* Behringer X-Touch Compact: Device Ready
+               */
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Behringer X-Touch Compact ready, current status = %1\n", _active));
+               turn_it_on ();
+               break;
+
        case 0x03: /* LCP Connection Confirmation */
                DEBUG_TRACE (DEBUG::MackieControl, "Logic Control Device confirms connection, ardour replies\n");
                if (bytes[4] == 0x10 || bytes[4] == 0x11) {
@@ -712,7 +724,9 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count
                DEBUG_TRACE (DEBUG::MackieControl, "Logic Control Device denies connection\n");
                _active = false;
                break;
+
        default:
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("unknown device ID byte %1", (int) bytes[5]));
                error << "MCP: unknown sysex: " << bytes << endmsg;
        }
 }
@@ -792,11 +806,11 @@ Surface::turn_it_on ()
                (*s)->notify_all ();
        }
 
-       update_view_mode_display ();
+       update_view_mode_display (false);
 
-       if (_mcp.device_info ().has_global_controls ()) {
-               _mcp.update_global_button (Button::Read, _mcp.metering_active ());
-       }
+//     if (_mcp.device_info ().has_global_controls ()) {
+//             _mcp.update_global_button (Button::Read, _mcp.metering_active ());
+//     }
 }
 
 void
@@ -900,10 +914,10 @@ Surface::periodic (uint64_t now_usecs)
 }
 
 void
-Surface::redisplay (ARDOUR::microseconds_t now)
+Surface::redisplay (ARDOUR::microseconds_t now, bool force)
 {
        for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
-               (*s)->redisplay (now);
+               (*s)->redisplay (now, force);
        }
 }
 
@@ -941,8 +955,6 @@ Surface::map_routes (const vector<boost::shared_ptr<Route> >& routes)
        for (; s != strips.end(); ++s) {
                (*s)->set_route (boost::shared_ptr<Route>());
        }
-
-
 }
 
 static char
@@ -1025,20 +1037,20 @@ void
 Surface::update_flip_mode_display ()
 {
        for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
-               (*s)->potmode_changed (true);
+               (*s)->flip_mode_changed ();
        }
 }
 
- void
-Surface::update_potmode ()
+void
+Surface::subview_mode_changed ()
 {
        for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
-               (*s)->potmode_changed (false);
+               (*s)->subview_mode_changed ();
        }
 }
 
 void
-Surface::update_view_mode_display ()
+Surface::update_view_mode_display (bool with_helpful_text)
 {
        string text;
        int id = -1;
@@ -1082,20 +1094,15 @@ Surface::update_view_mode_display ()
                id = Button::Aux;
                text = _("Auxes");
                break;
+       case MackieControlProtocol::Hidden:
+               show_two_char_display ("HI");
+               id = Button::Outputs;
+               text = _("Hidden Tracks");
+               break;
        case MackieControlProtocol::Selected:
                show_two_char_display ("SE");
                id = Button::User;
-               text = _("Selected Routes");
-               break;
-       case MackieControlProtocol::Dynamics:
-               show_two_char_display ("DI");
-               id = Button::User;
-               text = _("Dynamics");
-               break;
-       case MackieControlProtocol::EQ:
-               show_two_char_display ("EQ");
-               id = Button::User;
-               text = _("EQ");
+               text = _("Selected Tracks");
                break;
        default:
                break;
@@ -1108,6 +1115,7 @@ Surface::update_view_mode_display ()
        view_mode_buttons.push_back (Button::AudioTracks);
        view_mode_buttons.push_back (Button::MidiTracks);
        view_mode_buttons.push_back (Button::Aux);
+       view_mode_buttons.push_back (Button::Outputs);
        view_mode_buttons.push_back (Button::User);
 
        if (id >= 0) {
@@ -1127,7 +1135,7 @@ Surface::update_view_mode_display ()
                }
        }
 
-       if (!text.empty()) {
+       if (with_helpful_text && !text.empty()) {
                display_message_for (text, 1000);
        }
 }
@@ -1175,6 +1183,18 @@ Surface::route_is_locked_to_strip (boost::shared_ptr<Route> r) const
        return false;
 }
 
+bool
+Surface::route_is_mapped (boost::shared_ptr<Route> r) const
+{
+       for (Strips::const_iterator s = strips.begin(); s != strips.end(); ++s) {
+               if ((*s)->route() == r) {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
 void
 Surface::notify_metering_state_changed()
 {