ardour/livetrax
13
0
Fork 0
Code

subtle rework/rename of per-strip revert-to-vpot-display code

Browse Source
This commit is contained in:
Paul Davis 2015-10-07 18:06:43 -04:00
parent 4a1790b75e
commit 0f978a90f4
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/surfaces/mackie/strip.cc
View File

@ -760,11 +760,13 @@ Strip::periodic (uint64_t usecs)
return;
}
update_automation ();
update_meter ();
if (_reset_display_at && _reset_display_at < usecs) {
reset_display ();
if (_reset_display_at >= usecs) {
return;
} else if (_reset_display_at) {
return_to_vpot_mode_display ();
} else {
update_automation ();
update_meter ();
}
}
@ -1010,21 +1012,19 @@ Strip::queue_display_reset (uint32_t msecs)
}
void
Strip::clear_display_reset ()
Strip::return_to_vpot_mode_display ()
{
_reset_display_at = 0;
}
/* returns the second line of the two-line per-strip display
back the mode where it shows what the VPot controls.
*/
void
Strip::reset_display ()
{
if (_route) {
_surface->write (display (1, vpot_mode_string()));
} else {
_surface->write (blank_display (1));
}
clear_display_reset ();
_reset_display_at = 0;
}
struct RouteCompareByName {

3
libs/surfaces/mackie/strip.h
View File

@ -129,8 +129,7 @@ private:
std::string vpot_mode_string () const;
void queue_display_reset (uint32_t msecs);
void clear_display_reset ();
void reset_display ();
void return_to_vpot_mode_display ();
struct RedisplayRequest {
ARDOUR::AutomationType type;