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/axis_view.h | |
| 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/axis_view.h')
| -rw-r--r-- | gtk2_ardour/axis_view.h | 9 |
1 files changed, 3 insertions, 6 deletions
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<Gdk::Color> used_colors; |