From d3dbad3933015fbda076ed57f0aef9ae5671642e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 27 Jun 2008 19:02:19 +0000 Subject: fix eternal valgrind complaint about GainMeter::_width not being initialized; make GainMeterBase derive from sigc::trackable so that its slots are disconnected from signals when it is deleted git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3500 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/gain_meter.cc | 1 + gtk2_ardour/gain_meter.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 32b58373ca..0daa7e5470 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -83,6 +83,7 @@ GainMeterBase::GainMeterBase (boost::shared_ptr io, Session& s, meter_menu = 0; next_release_selects = false; style_changed = true; + _width = Wide; if (horizontal) { gain_slider = manage (new HSliderController (pix, diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 549bd091d0..cef6c02024 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -54,7 +54,7 @@ namespace Gtk { class Menu; } -class GainMeterBase +class GainMeterBase : virtual public sigc::trackable { public: GainMeterBase (boost::shared_ptr, ARDOUR::Session&, const Glib::RefPtr& pix, -- cgit v1.2.3