diff options
| author | Robin Gareus <robin@gareus.org> | 2015-04-25 06:46:29 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-04-25 06:46:29 +0200 |
| commit | 75087f5c62dd8d8796b23d875234e764c3ce687f (patch) | |
| tree | b631087c126ed5f9fbbd9ca60ad36b3ba17126e1 /libs | |
| parent | 00c1e0ea53094aa2c5d0cfdbc63932b49455fd9b (diff) | |
prepare 0dBFS peak meter
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/types.h | 25 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 1 |
3 files changed, 15 insertions, 12 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 4ba6cb3f27..3f95d0c239 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -180,18 +180,19 @@ namespace ARDOUR { }; enum MeterType { - MeterMaxSignal = 0x001, - MeterMaxPeak = 0x002, - MeterPeak = 0x004, - MeterKrms = 0x008, - MeterK20 = 0x010, - MeterK14 = 0x020, - MeterIEC1DIN = 0x040, - MeterIEC1NOR = 0x080, - MeterIEC2BBC = 0x100, - MeterIEC2EBU = 0x200, - MeterVU = 0x400, - MeterK12 = 0x800 + MeterMaxSignal = 0x0001, + MeterMaxPeak = 0x0002, + MeterPeak = 0x0004, + MeterKrms = 0x0008, + MeterK20 = 0x0010, + MeterK14 = 0x0020, + MeterIEC1DIN = 0x0040, + MeterIEC1NOR = 0x0080, + MeterIEC2BBC = 0x0100, + MeterIEC2EBU = 0x0200, + MeterVU = 0x0400, + MeterK12 = 0x0800, + MeterPeak0dB = 0x1000 }; enum TrackMode { diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index bc60dfcb09..b5a7447ab8 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -187,6 +187,7 @@ setup_enum_writer () REGISTER_ENUM (MeterIEC2BBC); REGISTER_ENUM (MeterIEC2EBU); REGISTER_ENUM (MeterVU); + REGISTER_ENUM (MeterPeak0dB); REGISTER (_MeterType); REGISTER_ENUM (Normal); diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 5913ca5477..e5fabfc291 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -385,6 +385,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) { } break; case MeterPeak: + case MeterPeak0dB: return peak_power(n); case MeterMaxSignal: if (n < _max_peak_signal.size()) { |