From c31435b474f8f87c33e6bc676115d20303857fe6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 Jun 2016 15:47:39 -0400 Subject: RouteUI is now also derived from SessionHandlePtr but NOT AxisView. Fix initialization. Only "most derived" classes can initialize virtual base classes (SessionHandlePtr) --- gtk2_ardour/axis_view.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/axis_view.h') diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 75a5f7d421..7a2a0fb079 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -78,11 +78,6 @@ class AxisView : public virtual Selectable, public virtual PBD::ScopedConnection static GUIObjectState& gui_object_state(); void clear_property_cache() { property_hashtable.clear(); } - protected: - - AxisView (ARDOUR::Session* sess); - virtual ~AxisView(); - /** * Generate a new random TrackView color, unique from those colors already used. * @@ -90,7 +85,9 @@ class AxisView : public virtual Selectable, public virtual PBD::ScopedConnection */ static Gdk::Color unique_random_color(); - Gdk::Color _color; + protected: + AxisView (); + virtual ~AxisView(); static std::list used_colors; -- cgit v1.2.3