smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

restore session backwards compatibility to 3.3

Browse source
This commit is contained in:
Robin Gareus 2013-07-22 19:59:24 +02:00
parent df17094b47
commit 06e7ad67ae
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/meter_patterns.cc
View file

@ -78,7 +78,7 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
case MeterPeak: case MeterPeak:
return _("Peak"); return _("Peak");
break; break;
case MeterRMS: case MeterKrms:
return _("RMS + Peak"); return _("RMS + Peak");
break; break;
case MeterIEC1DIN: case MeterIEC1DIN:
@ -116,7 +116,7 @@ static inline float mtr_col_and_fract(
switch (mt) { switch (mt) {
default: default:
case MeterRMS: case MeterKrms:
case MeterPeak: case MeterPeak:
fraction = log_meter (val); fraction = log_meter (val);
if (val >= 0 || val == -9) { if (val >= 0 || val == -9) {
@ -568,7 +568,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
break; break;
default: default:
case MeterPeak: case MeterPeak:
case MeterRMS: case MeterKrms:
points.insert (std::pair<int,string>(-50.0f, "-50")); points.insert (std::pair<int,string>(-50.0f, "-50"));
points.insert (std::pair<int,string>(-40.0f, "-40")); points.insert (std::pair<int,string>(-40.0f, "-40"));
points.insert (std::pair<int,string>(-30.0f, "-30")); points.insert (std::pair<int,string>(-30.0f, "-30"));
@ -745,7 +745,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
break; break;
default: default:
case MeterPeak: case MeterPeak:
case MeterRMS: case MeterKrms:
layout->set_text("dBFS"); layout->set_text("dBFS");
break; break;
case MeterIEC2EBU: case MeterIEC2EBU:

2
gtk2_ardour/meter_strip.cc
View file

@ -575,7 +575,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
_suspend_menu_callbacks = true; _suspend_menu_callbacks = true;
add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterRMS), MeterRMS); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);

2
gtk2_ardour/mixer_strip.cc
View file

@ -2134,7 +2134,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterRMS), MeterRMS); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);

2
libs/ardour/ardour/types.h
View file

@ -181,7 +181,7 @@ namespace ARDOUR {
MeterMaxSignal = 0x001, MeterMaxSignal = 0x001,
MeterMaxPeak = 0x002, MeterMaxPeak = 0x002,
MeterPeak = 0x004, MeterPeak = 0x004,
MeterRMS = 0x008, MeterKrms = 0x008,
MeterK20 = 0x010, MeterK20 = 0x010,
MeterK14 = 0x020, MeterK14 = 0x020,
MeterIEC1DIN = 0x040, MeterIEC1DIN = 0x040,

2
libs/ardour/enums.cc
View file

@ -176,7 +176,7 @@ setup_enum_writer ()
REGISTER_ENUM (MeterMaxSignal); REGISTER_ENUM (MeterMaxSignal);
REGISTER_ENUM (MeterMaxPeak); REGISTER_ENUM (MeterMaxPeak);
REGISTER_ENUM (MeterPeak); REGISTER_ENUM (MeterPeak);
REGISTER_ENUM (MeterRMS); REGISTER_ENUM (MeterKrms);
REGISTER_ENUM (MeterK20); REGISTER_ENUM (MeterK20);
REGISTER_ENUM (MeterK14); REGISTER_ENUM (MeterK14);
REGISTER_ENUM (MeterIEC1DIN); REGISTER_ENUM (MeterIEC1DIN);

6
libs/ardour/meter.cc
View file

@ -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 // Meter audio in to the rest of the peaks
for (uint32_t i = 0; i < n_audio; ++i, ++n) { for (uint32_t i = 0; i < n_audio; ++i, ++n) {
_peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[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); _kmeter[i]->process(bufs.get_audio(i).data(), nframes);
} }
if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) { if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) {
@ -323,7 +323,7 @@ PeakMeter::meter ()
float float
PeakMeter::meter_level(uint32_t n, MeterType type) { PeakMeter::meter_level(uint32_t n, MeterType type) {
switch (type) { switch (type) {
case MeterRMS: case MeterKrms:
case MeterK20: case MeterK20:
case MeterK14: case MeterK14:
{ {
@ -385,7 +385,7 @@ PeakMeter::set_type(MeterType t)
_meter_type = t; _meter_type = t;
if (t & (MeterRMS | MeterK20 | MeterK14)) { if (t & (MeterKrms | MeterK20 | MeterK14)) {
const size_t n_audio = current_meters.n_audio(); const size_t n_audio = current_meters.n_audio();
for (size_t n = 0; n < n_audio; ++n) { for (size_t n = 0; n < n_audio; ++n) {
_kmeter[n]->reset(); _kmeter[n]->reset();