prepare meter configuration..

- rework metric/tick image cache invalidation
  - flush cache
  - send signal to queue redraws
  (TODO) selectively flush cache // cache per size, style
- add four common line up levels

3 files changed, 31 insertions, 0 deletions

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index d8440f24f3..fa1e23db4d 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -149,6 +149,7 @@ CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", fal
 
 CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
 CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 32.0f)
+CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18)
 
 /* miscellany */
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 5bd03d2788..c41c599f1c 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -367,6 +367,13 @@ namespace ARDOUR {
 		MeteringRoute  ///< meter what is going through the route
 	};
 
+	enum MeterLineUp {
+		MeteringLineUp24,
+		MeteringLineUp20,
+		MeteringLineUp18,
+		MeteringLineUp15
+	};
+
 	enum PFLPosition {
 		/** PFL signals come from before pre-fader processors */
 		PFLFromBeforeProcessors,
@@ -567,6 +574,7 @@ std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::AutoConnectOption& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::EditMode& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::MonitorModel& sf);
+std::istream& operator>>(std::istream& o, ARDOUR::MeterLineUp& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::PFLPosition& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::AFLPosition& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::RemoteModel& sf);
@@ -588,6 +596,7 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::HeaderFormat& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::AutoConnectOption& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::EditMode& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::MonitorModel& sf);
+std::ostream& operator<<(std::ostream& o, const ARDOUR::MeterLineUp& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::PFLPosition& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::AFLPosition& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::RemoteModel& sf);
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index b96394d16f..2bf8ded866 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -61,6 +61,7 @@ setup_enum_writer ()
 	ColorMode _ColorMode;
 	MeterFalloff _MeterFalloff;
 	MeterHold _MeterHold;
+	MeterLineUp _MeterLineUp;
 	EditMode _EditMode;
 	RegionPoint _RegionPoint;
 	Placement _Placement;
@@ -205,6 +206,12 @@ setup_enum_writer ()
 	REGISTER_ENUM (MeterHoldLong);
 	REGISTER (_MeterHold);
 
+	REGISTER_ENUM (MeteringLineUp24);
+	REGISTER_ENUM (MeteringLineUp20);
+	REGISTER_ENUM (MeteringLineUp18);
+	REGISTER_ENUM (MeteringLineUp15);
+	REGISTER (_MeterLineUp);
+
 	REGISTER_ENUM (Slide);
 	REGISTER_ENUM (Splice);
 	REGISTER_ENUM (Lock);
@@ -652,6 +659,20 @@ std::ostream& operator<<(std::ostream& o, const MonitorModel& var)
 	return o << s;
 }
 
+std::istream& operator>>(std::istream& o, MeterLineUp& var)
+{
+	std::string s;
+	o >> s;
+	var = (MeterLineUp) string_2_enum (s, var);
+	return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const MeterLineUp& var)
+{
+	std::string s = enum_2_string (var);
+	return o << s;
+}
+
 std::istream& operator>>(std::istream& o, PFLPosition& var)
 {
 	std::string s;