summaryrefslogtreecommitdiff
path: root/gtk2_ardour/level_meter.h
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/level_meter.h
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/level_meter.h')
-rw-r--r--gtk2_ardour/level_meter.h6
1 files changed, 3 insertions, 3 deletions
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;