diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-28 20:43:21 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:26:16 -0400 |
| commit | 94f64aeea6359651be3f59245042f9b5ac9f1cda (patch) | |
| tree | ee761ba7569bd5a04a8c43512ddddd6ab5f7d2a5 /gtk2_ardour/level_meter.h | |
| parent | 59a3b797d7623c9aeebaf6262e9af1f71462faf7 (diff) | |
fix diamond inheritance - gtkmm main class is sigc::trackable
Diffstat (limited to 'gtk2_ardour/level_meter.h')
| -rw-r--r-- | gtk2_ardour/level_meter.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h index 0a59f1a337..abb5e327ed 100644 --- a/gtk2_ardour/level_meter.h +++ b/gtk2_ardour/level_meter.h @@ -49,12 +49,12 @@ namespace Gtk { class Menu; } -class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr +class LevelMeterBase : public ARDOUR::SessionHandlePtr { public: - LevelMeterBase (ARDOUR::Session*, + LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir, Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical); - ~LevelMeterBase (); + virtual ~LevelMeterBase (); virtual void set_meter (ARDOUR::PeakMeter* meter); @@ -78,6 +78,7 @@ class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr virtual void mtr_remove(Gtk::Widget &w) = 0; private: + PBD::EventLoop::InvalidationRecord* parent_invalidator; ARDOUR::PeakMeter* _meter; Gtkmm2ext::FastMeter::Orientation _meter_orientation; |