prepare 0dBFS peak meter
authorRobin Gareus <robin@gareus.org>
Sat, 25 Apr 2015 04:46:29 +0000 (06:46 +0200)
committerRobin Gareus <robin@gareus.org>
Sat, 25 Apr 2015 04:46:29 +0000 (06:46 +0200)
libs/ardour/ardour/types.h
libs/ardour/enums.cc
libs/ardour/meter.cc

index 4ba6cb3f27e8632f3c4b2cc88632da2ee12b6823..3f95d0c2390bc5a2a35d357664eb7d682dcb573c 100644 (file)
@@ -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 {
index bc60dfcb09033ba0b5cb9060d048a2a9906d5605..b5a7447ab8cc262dfb26af107a10d965a4a18c03 100644 (file)
@@ -187,6 +187,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterIEC2BBC);
        REGISTER_ENUM (MeterIEC2EBU);
        REGISTER_ENUM (MeterVU);
+       REGISTER_ENUM (MeterPeak0dB);
        REGISTER (_MeterType);
 
        REGISTER_ENUM (Normal);
index 5913ca54773aa1b70b47454f5a6d64e9bd153ca1..e5fabfc291e5f8cece9d0399137148a146ecdc69 100644 (file)
@@ -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()) {