ardour/livetrax
13
0
Fork 0
Code

NO-OP: rename variable

Browse Source
This commit is contained in:
Robin Gareus 2019-06-09 19:44:29 +02:00
parent 9390f17f36
commit 1391f49dbc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk2_ardour/level_meter.cc
View File

@ -149,25 +149,25 @@ LevelMeterBase::update_meters ()
if (n < nmidi) {
(*i).meter->set (_meter->meter_level (n, MeterPeak));
} else {
MeterType _meter_type = _meter->meter_type ();
const float peak = _meter->meter_level (n, _meter_type);
if (_meter_type == MeterPeak) {
MeterType meter_type = _meter->meter_type ();
const float peak = _meter->meter_level (n, meter_type);
if (meter_type == MeterPeak) {
(*i).meter->set (log_meter (peak));
} else if (_meter_type == MeterPeak0dB) {
} else if (meter_type == MeterPeak0dB) {
(*i).meter->set (log_meter0dB (peak));
} else if (_meter_type == MeterIEC1NOR) {
} else if (meter_type == MeterIEC1NOR) {
(*i).meter->set (meter_deflect_nordic (peak + meter_lineup(0)));
} else if (_meter_type == MeterIEC1DIN) {
} else if (meter_type == MeterIEC1DIN) {
(*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(UIConfiguration::instance().get_meter_line_up_din(), 3.0)));
} else if (_meter_type == MeterIEC2BBC || _meter_type == MeterIEC2EBU) {
} else if (meter_type == MeterIEC2BBC || meter_type == MeterIEC2EBU) {
(*i).meter->set (meter_deflect_ppm (peak + meter_lineup(0)));
} else if (_meter_type == MeterVU) {
} else if (meter_type == MeterVU) {
(*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0)));
} else if (_meter_type == MeterK12) {
} else if (meter_type == MeterK12) {
(*i).meter->set (meter_deflect_k (peak, 12), meter_deflect_k(_meter->meter_level(n, MeterPeak), 12));
} else if (_meter_type == MeterK14) {
} else if (meter_type == MeterK14) {
(*i).meter->set (meter_deflect_k (peak, 14), meter_deflect_k(_meter->meter_level(n, MeterPeak), 14));
} else if (_meter_type == MeterK20) {
} else if (meter_type == MeterK20) {
(*i).meter->set (meter_deflect_k (peak, 20), meter_deflect_k(_meter->meter_level(n, MeterPeak), 20));
} else { // RMS
(*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak)));
@ -253,7 +253,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
return; /* do it later or never */
}
MeterType _meter_type = _meter->meter_type ();
MeterType meter_type = _meter->meter_type ();
uint32_t nmidi = _meter->input_streams().n_midi();
uint32_t nmeters = _meter->input_streams().n_total();
regular_meter_width = initial_width;
@ -281,7 +281,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
&& meters[0].width == width
&& meters[0].length == len
&& !color_changed
&& _meter_type == visible_meter_type) {
&& meter_type == visible_meter_type) {
return;
}
@ -291,7 +291,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
(meters.size() > 0 && meters[0].width == width) ? "yes" : "no",
(meters.size() > 0 && meters[0].length == len) ? "yes" : "no",
(nmeters == meter_count) ? "yes" : "no",
(_meter_type == visible_meter_type) ? "yes" : "no",
(meter_type == visible_meter_type) ? "yes" : "no",
!color_changed ? "yes" : "no"
);
#endif
@ -339,7 +339,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
c[8] = UIConfiguration::instance().color ("meter color8");
c[9] = UIConfiguration::instance().color ("meter color9");
switch (_meter_type) {
switch (meter_type) {
case MeterK20:
stp[0] = 115.0 * meter_deflect_k(-40, 20); //-20
stp[1] = 115.0 * meter_deflect_k(-20, 20); // 0
@ -451,7 +451,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
}
}
}
if (meters[n].width != width || meters[n].length != len || color_changed || _meter_type != visible_meter_type || nmidi != midi_count) {
if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type || nmidi != midi_count) {
bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false;
meters[n].packed = false;
delete meters[n].meter;
@ -481,7 +481,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
}
//show();
color_changed = false;
visible_meter_type = _meter_type;
visible_meter_type = meter_type;
midi_count = nmidi;
meter_count = nmeters;
}