diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-23 21:20:51 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-23 21:20:51 +0200 |
commit | 8da6a70ead63767b701a00aeaf859569b0d31ee4 (patch) | |
tree | 233e7d0752423a07d4e91cfe2dbb0ba3840a11bf /libs/ardour/ardour | |
parent | dd65329363c27d4674d8b3ec80342b59340d58be (diff) |
implement meter-lineup and VU standard preferences
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/types.h | 8 |
2 files changed, 9 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); |