diff options
| -rw-r--r-- | libs/ardour/midi_ui.cc | 1 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 22 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/mackie/surface.cc | 2 |
4 files changed, 14 insertions, 19 deletions
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index fba5d17740..770a371457 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -135,7 +135,6 @@ MidiControlUI::reset_ports () for (MIDI::Manager::PortList::const_iterator i = plist->begin(); i != plist->end(); ++i) { if (!(*i)->centrally_parsed()) { - cerr << "Skip MIDI port " << (*i)->name() << endl; continue; } diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 1eab8bf1d4..3aaaf7582d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -77,8 +77,6 @@ using namespace Glib; #include "pbd/abstract_ui.cc" // instantiate template #define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) -extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int); -#define invalidator() __invalidator ((*this), __FILE__, __LINE__) const int MackieControlProtocol::MODIFIER_OPTION = 0x1; const int MackieControlProtocol::MODIFIER_CONTROL = 0x2; @@ -107,7 +105,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session) DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n"); AudioEngine::instance()->PortConnectedOrDisconnected.connect ( - audio_engine_connections, invalidator (), ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5), + audio_engine_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5), this ); @@ -451,23 +449,23 @@ void MackieControlProtocol::connect_session_signals() { // receive routes added - session->RouteAdded.connect(session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_route_added, this, _1), this); + session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_route_added, this, _1), this); // receive record state toggled - session->RecordStateChanged.connect(session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_record_state_changed, this), this); + session->RecordStateChanged.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_record_state_changed, this), this); // receive transport state changed - session->TransportStateChange.connect(session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_transport_state_changed, this), this); + session->TransportStateChange.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_transport_state_changed, this), this); // receive punch-in and punch-out - Config->ParameterChanged.connect(session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this); - session->config.ParameterChanged.connect (session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this); + Config->ParameterChanged.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this); + session->config.ParameterChanged.connect (session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this); // receive rude solo changed - session->SoloActive.connect(session_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), this); + session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), this); // make sure remote id changed signals reach here // see also notify_route_added Sorted sorted = get_sorted_routes(); for (Sorted::iterator it = sorted.begin(); it != sorted.end(); ++it) { - (*it)->RemoteControlIDChanged.connect (route_connections, invalidator(), ui_bind(&MackieControlProtocol::notify_remote_id_changed, this), this); + (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, ui_bind(&MackieControlProtocol::notify_remote_id_changed, this), this); } } @@ -694,7 +692,7 @@ MackieControlProtocol::notify_route_added (ARDOUR::RouteList & rl) typedef ARDOUR::RouteList ARS; for (ARS::iterator it = rl.begin(); it != rl.end(); ++it) { - (*it)->RemoteControlIDChanged.connect (route_connections, invalidator(), ui_bind (&MackieControlProtocol::notify_remote_id_changed, this), this); + (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_remote_id_changed, this), this); } } @@ -793,7 +791,7 @@ MackieControlProtocol::do_request (MackieControlUIRequest* req) { if (req->type == CallSlot) { - call_slot (invalidator(), req->the_slot); + call_slot (MISSING_INVALIDATOR, req->the_slot); } else if (req->type == Quit) { diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 253b39db82..eaa7491413 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -90,14 +90,15 @@ LedState MackieControlProtocol::left_press (Button &) { Sorted sorted = get_sorted_routes(); - if (sorted.size() > n_strips()) { - int new_initial = _current_initial_bank - n_strips(); + uint32_t strip_cnt = n_strips (); + + if (sorted.size() > strip_cnt) { + int new_initial = _current_initial_bank - strip_cnt; if (new_initial < 0) { new_initial = 0; } if (new_initial != int (_current_initial_bank)) { - session->set_dirty(); switch_banks (new_initial); } @@ -127,7 +128,6 @@ MackieControlProtocol::right_press (Button &) } if (delta > 0) { - session->set_dirty(); switch_banks (_current_initial_bank + delta); } diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 050f60b9da..ee928263c3 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -253,8 +253,6 @@ Surface::init_strips () snprintf (name, sizeof (name), "strip_%d", (8* _number) + i); - cerr << "Register strip " << i << endl; - Strip* strip = new Strip (*this, name, i, mackie_strip_controls); groups[name] = strip; |