implement meter-lineup and VU standard preferences

3 files changed, 29 insertions, 0 deletions

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index f87781c8a9..5716fa5105 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 (VUMeterStandard, meter_vu_standard, "meter-vu-standard", MeteringVUfrench)
 CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18)
 CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f)
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 553ee1ea28..11cdb79575 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -383,6 +383,12 @@ namespace ARDOUR {
 		MeteringRoute  ///< meter what is going through the route
 	};
 
+	enum VUMeterStandard {
+		MeteringVUfrench,   // + 2
+		MeteringVUamerican, // +-0
+		MeteringVUstandard  // -4
+	};
+
 	enum MeterLineUp {
 		MeteringLineUp24,
 		MeteringLineUp20,
@@ -590,6 +596,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::VUMeterStandard& 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);
@@ -612,6 +619,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::VUMeterStandard& 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);
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 0d225fada3..e60977a3e5 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -62,6 +62,7 @@ setup_enum_writer ()
 	ColorMode _ColorMode;
 	MeterFalloff _MeterFalloff;
 	MeterHold _MeterHold;
+	VUMeterStandard _VUMeterStandard;
 	MeterLineUp _MeterLineUp;
 	EditMode _EditMode;
 	RegionPoint _RegionPoint;
@@ -222,6 +223,11 @@ setup_enum_writer ()
 	REGISTER_ENUM (MeterHoldLong);
 	REGISTER (_MeterHold);
 
+	REGISTER_ENUM (MeteringVUfrench);
+	REGISTER_ENUM (MeteringVUamerican);
+	REGISTER_ENUM (MeteringVUstandard);
+	REGISTER (_VUMeterStandard);
+
 	REGISTER_ENUM (MeteringLineUp24);
 	REGISTER_ENUM (MeteringLineUp20);
 	REGISTER_ENUM (MeteringLineUp18);
@@ -675,6 +681,20 @@ std::ostream& operator<<(std::ostream& o, const MonitorModel& var)
 	return o << s;
 }
 
+std::istream& operator>>(std::istream& o, VUMeterStandard& var)
+{
+	std::string s;
+	o >> s;
+	var = (VUMeterStandard) string_2_enum (s, var);
+	return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const VUMeterStandard& var)
+{
+	std::string s = enum_2_string (var);
+	return o << s;
+}
+
 std::istream& operator>>(std::istream& o, MeterLineUp& var)
 {
 	std::string s;