ardour/livetrax
13
0
Fork 0
Code

Make sure Mackie Control view modes start with route 1 except Mixer mode goes to last position.

Browse Source
This commit is contained in:
Len Ovens 2015-10-20 19:31:04 -07:00
parent 81f6ad0d0c
commit 7a453d2329
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/surfaces/mackie/mackie_control_protocol.h
View File

@ -328,6 +328,7 @@ class MackieControlProtocol
ARDOUR::RouteNotificationList _last_selected_routes;
XMLNode* configuration_state;
int state_version;
int _last_mix_bank;
boost::shared_ptr<ArdourSurface::Mackie::Surface> _master_surface;

27
libs/surfaces/mackie/mcp_buttons.cc
View File

@ -857,8 +857,11 @@ MackieControlProtocol::miditracks_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::miditracks_release (Mackie::Button&)
{
if (_view_mode == Mixer) {
_last_mix_bank = _current_initial_bank;
}
set_view_mode (MidiTracks);
refresh_current_bank();
switch_banks(0, true);
return none;
}
Mackie::LedState
@ -879,8 +882,11 @@ MackieControlProtocol::audiotracks_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::audiotracks_release (Mackie::Button&)
{
if (_view_mode == Mixer) {
_last_mix_bank = _current_initial_bank;
}
set_view_mode (AudioTracks);
refresh_current_bank();
switch_banks(0, true);
return none;
}
Mackie::LedState
@ -901,8 +907,11 @@ MackieControlProtocol::aux_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::aux_release (Mackie::Button&)
{
if (_view_mode == Mixer) {
_last_mix_bank = _current_initial_bank;
}
set_view_mode (Auxes);
refresh_current_bank();
switch_banks(0, true);
return none;
}
Mackie::LedState
@ -913,8 +922,11 @@ MackieControlProtocol::busses_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::busses_release (Mackie::Button&)
{
if (_view_mode == Mixer) {
_last_mix_bank = _current_initial_bank;
}
set_view_mode (Busses);
refresh_current_bank();
switch_banks(0, true);
return none;
}
Mackie::LedState
@ -935,8 +947,11 @@ MackieControlProtocol::user_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::user_release (Mackie::Button&)
{
if (_view_mode == Mixer) {
_last_mix_bank = _current_initial_bank;
}
set_view_mode (Selected);
refresh_current_bank();
switch_banks(0, true);
return none;
}
Mackie::LedState
@ -1003,7 +1018,7 @@ Mackie::LedState
MackieControlProtocol::view_press (Mackie::Button&)
{
set_view_mode (Mixer);
refresh_current_bank();
switch_banks (_last_mix_bank, true);
return none;
}
Mackie::LedState