From 0f978a90f48b1544b179416998d3ac11b1c61002 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 7 Oct 2015 18:06:43 -0400
Subject: [PATCH] subtle rework/rename of per-strip revert-to-vpot-display code

---
 libs/surfaces/mackie/strip.cc | 24 ++++++++++++------------
 libs/surfaces/mackie/strip.h  |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 3633430e98..616947b71f 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -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 {
diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 55a6fbef8c..87c96b3687 100644
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -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;
-- 
2.30.2