diff options
| author | Len Ovens <len@ovenwerks.net> | 2015-09-28 20:13:15 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2015-09-28 20:13:15 -0700 |
| commit | 239da0efb58849e545ec44aeb839d41b8e4792cf (patch) | |
| tree | 7c0ac52d5a348e8f4690347ec27c32d402636566 /libs/ardour/ardour | |
| parent | 7f86418340f80fa20edee0557fe008b4053a7728 (diff) | |
Fix Mackie control metering (fixes #6608).
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/meter.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 7539db2140..a3bd34e1b7 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -97,6 +97,7 @@ private: std::vector<float> _peak_buffer; // internal, integrate std::vector<float> _peak_power; // includes accurate falloff, hence dB std::vector<float> _max_peak_signal; // dB calculation is done on demand + float _combined_peak; // Mackie surfaces expect the highest peak of all track channels std::vector<Kmeterdsp *> _kmeter; std::vector<Iec1ppmdsp *> _iec1meter; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index f2facd340b..5bd7b87929 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -192,7 +192,8 @@ namespace ARDOUR { MeterIEC2EBU = 0x0200, MeterVU = 0x0400, MeterK12 = 0x0800, - MeterPeak0dB = 0x1000 + MeterPeak0dB = 0x1000, + MeterMCP = 0x2000 }; enum TrackMode { |