summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-02-24 23:35:26 +0100
committerRobin Gareus <robin@gareus.org>2017-02-24 23:41:21 +0100
commitd0286d3df184f7ca05c148a2045d18cfb3113a68 (patch)
tree9dbaf25eb0e4e39832b2d2c08c59bb2f73f4024f /gtk2_ardour
parent437ec10b318fb44a24c2cadb82da30cfb2a563bf (diff)
NO-OP resolve an ambiguity, just because.
Due to LevelMeterVBox : public LevelMeterBase, public Gtk::VBox; LevelMeterBase::get_type() overloads Gtk::Widget::get_type(), Glib::Object::get_type(), Atk::Implementor::get_type() etc.. Besides Ardour-style prefers not to use get_...()
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/gain_meter.cc2
-rw-r--r--gtk2_ardour/level_meter.cc38
-rw-r--r--gtk2_ardour/level_meter.h6
-rw-r--r--gtk2_ardour/meter_strip.cc10
4 files changed, 28 insertions, 28 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 599894de1c..0a66784a93 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -384,7 +384,7 @@ GainMeterBase::setup_meters (int len)
void
GainMeterBase::set_type (MeterType t)
{
- level_meter->set_type(t);
+ level_meter->set_meter_type(t);
}
void
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 70e922bdb3..2658352790 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -49,7 +49,7 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord*
, meter_length (0)
, thin_meter_width(2)
, max_peak (minus_infinity())
- , meter_type (MeterPeak)
+ , _meter_type (MeterPeak)
, visible_meter_type (MeterType(0))
, midi_count (0)
, meter_count (0)
@@ -150,24 +150,24 @@ LevelMeterBase::update_meters ()
if (n < nmidi) {
(*i).meter->set (_meter->meter_level (n, MeterPeak));
} else {
- const float peak = _meter->meter_level (n, meter_type);
- if (meter_type == MeterPeak) {
+ 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)));
@@ -218,7 +218,7 @@ LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/)
void
LevelMeterBase::meter_type_changed (MeterType t)
{
- meter_type = t;
+ _meter_type = t;
setup_meters (meter_length, regular_meter_width, thin_meter_width);
MeterTypeChanged(t);
}
@@ -282,7 +282,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;
}
@@ -292,7 +292,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
@@ -340,7 +340,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
@@ -452,7 +452,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;
@@ -482,15 +482,15 @@ 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;
}
void
-LevelMeterBase::set_type(MeterType t)
+LevelMeterBase::set_meter_type(MeterType t)
{
- meter_type = t;
+ _meter_type = t;
_meter->set_type(t);
}
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 85fd5ac1e6..9b2a648b01 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -67,8 +67,8 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
void setup_meters (int len=0, int width=3, int thin=2);
void set_max_audio_meter_count (uint32_t cnt = 0);
- void set_type (ARDOUR::MeterType);
- ARDOUR::MeterType get_type () { return meter_type; }
+ void set_meter_type (ARDOUR::MeterType);
+ ARDOUR::MeterType meter_type () { return _meter_type; }
/** Emitted in the GUI thread when a button is pressed over the meter */
PBD::Signal1<bool, GdkEventButton *> ButtonPress;
@@ -107,7 +107,7 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
guint16 thin_meter_width;
std::vector<MeterInfo> meters;
float max_peak;
- ARDOUR::MeterType meter_type;
+ ARDOUR::MeterType _meter_type;
ARDOUR::MeterType visible_meter_type;
uint32_t midi_count;
uint32_t meter_count;
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index a497851fb0..7c497e41a3 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -142,7 +142,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
level_meter = new LevelMeterHBox(sess);
level_meter->set_meter (_route->shared_peak_meter().get());
level_meter->clear_meters();
- level_meter->set_type (_route->meter_type());
+ level_meter->set_meter_type (_route->meter_type());
level_meter->setup_meters (220, meter_width, 6);
level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1));
level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
@@ -927,7 +927,7 @@ MeterStrip::set_meter_type (MeterType type)
if (_suspend_menu_callbacks) return;
if (_route->meter_type() == type) return;
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
void
@@ -953,14 +953,14 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
switch (what) {
case -1:
if (_route && group == _route->route_group()) {
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
break;
case 0:
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
default:
if (what == _strip_type) {
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
break;
}