diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-22 19:59:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-22 19:59:24 +0200 |
| commit | 06e7ad67ae9fb84828011d7522d7c1b4cbeb7c37 (patch) | |
| tree | 854880ca801bfa49be8d52a8f2c987cba12cf846 /libs | |
| parent | df17094b478100f41ebaf4cd30432cef933b7523 (diff) | |
restore session backwards compatibility to 3.3
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 7b396796ad..553ee1ea28 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -181,7 +181,7 @@ namespace ARDOUR { MeterMaxSignal = 0x001, MeterMaxPeak = 0x002, MeterPeak = 0x004, - MeterRMS = 0x008, + MeterKrms = 0x008, MeterK20 = 0x010, MeterK14 = 0x020, MeterIEC1DIN = 0x040, diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index eab3176f57..0d225fada3 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -176,7 +176,7 @@ setup_enum_writer () REGISTER_ENUM (MeterMaxSignal); REGISTER_ENUM (MeterMaxPeak); REGISTER_ENUM (MeterPeak); - REGISTER_ENUM (MeterRMS); + REGISTER_ENUM (MeterKrms); REGISTER_ENUM (MeterK20); REGISTER_ENUM (MeterK14); REGISTER_ENUM (MeterIEC1DIN); diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 8b9ed436a4..32c7439fd5 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -106,7 +106,7 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr // Meter audio in to the rest of the peaks for (uint32_t i = 0; i < n_audio; ++i, ++n) { _peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]); - if (_meter_type & (MeterRMS | MeterK20 | MeterK14)) { + if (_meter_type & (MeterKrms | MeterK20 | MeterK14)) { _kmeter[i]->process(bufs.get_audio(i).data(), nframes); } if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) { @@ -323,7 +323,7 @@ PeakMeter::meter () float PeakMeter::meter_level(uint32_t n, MeterType type) { switch (type) { - case MeterRMS: + case MeterKrms: case MeterK20: case MeterK14: { @@ -385,7 +385,7 @@ PeakMeter::set_type(MeterType t) _meter_type = t; - if (t & (MeterRMS | MeterK20 | MeterK14)) { + if (t & (MeterKrms | MeterK20 | MeterK14)) { const size_t n_audio = current_meters.n_audio(); for (size_t n = 0; n < n_audio; ++n) { _kmeter[n]->reset(); |