From 94f64aeea6359651be3f59245042f9b5ac9f1cda Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 28 Jul 2013 20:43:21 +0200 Subject: fix diamond inheritance - gtkmm main class is sigc::trackable --- gtk2_ardour/level_meter.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/level_meter.h') 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; -- cgit v1.2.3