diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-17 08:20:11 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:42 -0400 |
| commit | 4b0a235f91c43a0011b2bc466a910c5b015560e0 (patch) | |
| tree | 4bf7ca6a48cc871f7b8a82e2c01eb6fca74a388d /libs/surfaces/mackie/mackie_control_protocol.cc | |
| parent | 01890af71e19004f5e830161f6d41d810d5f2687 (diff) | |
manually fix rebase/merge issues for Mackie Control support
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.cc')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index fbd6f286bc..4ff195d40c 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -428,9 +428,9 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force) DEBUG_TRACE (DEBUG::MackieControl, string_compose ("clear all strips, bank target %1 is outside route range %2\n", _current_initial_bank, sorted.size())); for (Surfaces::iterator si = surfaces.begin(); si != surfaces.end(); ++si) { - vector<boost::shared_ptr<Route> > routes; - /* pass in an empty route list, so that all strips will be reset */ - (*si)->map_routes (routes); + vector<boost::shared_ptr<Stripable> > stripables; + /* pass in an empty stripables list, so that all strips will be reset */ + (*si)->map_stripables (stripables); } return -1; } @@ -1793,8 +1793,8 @@ MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Strip _subview_mode = sm; _subview_stripable = r; - if (_subview_route != old_stripable) { - subview_route_connections.drop_connections (); + if (_subview_stripable != old_stripable) { + subview_stripable_connections.drop_connections (); /* Catch the current subview stripable going away */ if (_subview_stripable) { |