ardour/livetrax
13
0
Fork 0
Code

fix logic to reshow strip "name" after a message display

Browse Source
This commit is contained in:
Paul Davis 2015-10-08 14:58:28 -04:00
parent 02181174c3
commit d3efef7f5c
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,18 +387,25 @@ Strip::notify_property_changed (const PropertyChange& what_changed)
return; return;
} }
if (_route) { show_route_name ();
string line1; }
string fullname = _route->name();
if (fullname.length() <= 6) { void
line1 = fullname; Strip::show_route_name ()
} else { {
line1 = PBD::short_version (fullname, 6); if (!_route) {
} return;
_surface->write (display (0, line1));
} }
string line1;
string fullname = _route->name();
if (fullname.length() <= 6) {
line1 = fullname;
} else {
line1 = PBD::short_version (fullname, 6);
}
_surface->write (display (0, line1));
} }
void void
@ -763,6 +770,7 @@ void
Strip::periodic (ARDOUR::microseconds_t now) Strip::periodic (ARDOUR::microseconds_t now)
{ {
bool reshow_vpot_mode = false; bool reshow_vpot_mode = false;
bool reshow_name = false;
if (!_route) { if (!_route) {
return; return;
@ -779,6 +787,7 @@ Strip::periodic (ARDOUR::microseconds_t now)
_block_screen_redisplay_until = 0; _block_screen_redisplay_until = 0;
reshow_vpot_mode = true; reshow_vpot_mode = true;
reshow_name = true;
} }
if (_block_vpot_mode_redisplay_until >= now) { if (_block_vpot_mode_redisplay_until >= now) {
@ -791,6 +800,10 @@ Strip::periodic (ARDOUR::microseconds_t now)
reshow_vpot_mode = true; reshow_vpot_mode = true;
} }
if (reshow_name) {
show_route_name ();
}
if (reshow_vpot_mode) { if (reshow_vpot_mode) {
return_to_vpot_mode_display (); return_to_vpot_mode_display ();
} else { } else {

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

@ -159,6 +159,7 @@ private:
std::vector<Evoral::Parameter> possible_pot_parameters; std::vector<Evoral::Parameter> possible_pot_parameters;
void next_pot_mode (); void next_pot_mode ();
void set_vpot_parameter (Evoral::Parameter); void set_vpot_parameter (Evoral::Parameter);
void show_route_name ();
void reset_saved_values (); void reset_saved_values ();