diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-05 15:47:39 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-05 16:33:01 -0400 |
| commit | c31435b474f8f87c33e6bc676115d20303857fe6 (patch) | |
| tree | 6ee124d92cd34d223bab0296b3b4ae3a878a0868 /gtk2_ardour/meter_strip.cc | |
| parent | 384d05dd35191077f3c2e6a5b6547f627aa0b68f (diff) | |
RouteUI is now also derived from SessionHandlePtr but NOT AxisView. Fix initialization.
Only "most derived" classes can initialize virtual base classes (SessionHandlePtr)
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 596906c5e8..3ad2e8442c 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -62,8 +62,7 @@ PBD::Signal0<void> MeterStrip::ConfigurationChanged; #define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) MeterStrip::MeterStrip (int metricmode, MeterType mt) - : AxisView(0) - , RouteUI(0) + : RouteUI ((Session*) 0) { level_meter = 0; _strip_type = 0; @@ -117,7 +116,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) } MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteUI(0) , _route(rt) , peak_display() |