smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

MCP: more tracing for rewind; change play LED illumination rule

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11919 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-11 20:48:51 +00:00
parent 496a1e6965
commit 96d4ba88d1
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -107,6 +107,7 @@ BasicUI::add_marker (const std::string& markername)
void void
BasicUI::rewind () BasicUI::rewind ()
{ {
std::cerr << "request transport speed of " << session->transport_speed() - 1.5 << std::endl;
session->request_transport_speed (session->transport_speed() - 1.5); session->request_transport_speed (session->transport_speed() - 1.5);
} }

14
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -160,7 +160,6 @@ void
MackieControlProtocol::prev_track() MackieControlProtocol::prev_track()
{ {
if (_current_initial_bank >= 1) { if (_current_initial_bank >= 1) {
session->set_dirty();
switch_banks (_current_initial_bank - 1); switch_banks (_current_initial_bank - 1);
} }
} }
@ -172,7 +171,6 @@ MackieControlProtocol::next_track()
{ {
Sorted sorted = get_sorted_routes(); Sorted sorted = get_sorted_routes();
if (_current_initial_bank + n_strips() < sorted.size()) { if (_current_initial_bank + n_strips() < sorted.size()) {
session->set_dirty();
switch_banks (_current_initial_bank + 1); switch_banks (_current_initial_bank + 1);
} }
} }
@ -277,7 +275,6 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch banking to start at %1 force ? %2 current = %3\n", initial, force, _current_initial_bank)); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch banking to start at %1 force ? %2 current = %3\n", initial, force, _current_initial_bank));
if (initial == _current_initial_bank && !force) { if (initial == _current_initial_bank && !force) {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
return; return;
} }
@ -285,8 +282,7 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
uint32_t strip_cnt = n_strips(); uint32_t strip_cnt = n_strips();
if (sorted.size() <= strip_cnt && !force) { if (sorted.size() <= strip_cnt && !force) {
/* no banking */ /* no banking - not enough routes to fill all strips */
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
return; return;
} }
@ -333,6 +329,10 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
/* reset this to get the right display of view mode after the switch */ /* reset this to get the right display of view mode after the switch */
set_view_mode (_view_mode); set_view_mode (_view_mode);
/* current bank has not been saved */
session->set_dirty();
} }
int int
@ -782,7 +782,7 @@ void
MackieControlProtocol::notify_transport_state_changed() MackieControlProtocol::notify_transport_state_changed()
{ {
// switch various play and stop buttons on / off // switch various play and stop buttons on / off
update_global_button ("play", session->transport_rolling()); update_global_button ("play", session->transport_speed() == 1.0);
update_global_button ("stop", !session->transport_rolling()); update_global_button ("stop", !session->transport_rolling());
update_global_button ("rewind", session->transport_speed() < 0.0); update_global_button ("rewind", session->transport_speed() < 0.0);
update_global_button ("ffwd", session->transport_speed() > 1.0); update_global_button ("ffwd", session->transport_speed() > 1.0);
@ -1015,6 +1015,8 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
default: default:
break; break;
} }
} else {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button handlers for ID %1\n", button.id()));
} }
} }

1
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -502,6 +502,7 @@ MackieControlProtocol::record_release (Button &)
LedState LedState
MackieControlProtocol::rewind_press (Button &) MackieControlProtocol::rewind_press (Button &)
{ {
DEBUG_TRACE (DEBUG::MackieControl, "REWIND PRESS\n");
rewind (); rewind ();
return none; return none;
} }