fix a crash when deleting a MIDI region with CC automation (see recipe below)

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 75a5f7d42186cfd882320b6b9fc621bf791d7714..2a7c3781978d92d8ea5e959c4ed794a2a9fe3cf5 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -37,13 +37,16 @@
 
 namespace ARDOUR {
        class Session;
+       class Stripable;
+       class PresentationInfo;
 }
 
 /**
- * AxisView defines the abstract base class for time-axis trackviews and routes.
+ * AxisView defines the abstract base class for horizontal and vertical
+ * presentations of Stripables.
  *
  */
-class AxisView : public virtual Selectable, public virtual PBD::ScopedConnectionList, public virtual ARDOUR::SessionHandlePtr
+class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR::SessionHandlePtr, public virtual Selectable
 {
   public:
        ARDOUR::Session* session() const { return _session; }
@@ -53,6 +56,8 @@ class AxisView : public virtual Selectable, public virtual PBD::ScopedConnection
 
        sigc::signal<void> Hiding;
 
+       virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
+
        virtual std::string state_id() const = 0;
        /* for now, we always return properties in string form.
         */
@@ -72,17 +77,14 @@ class AxisView : public virtual Selectable, public virtual PBD::ScopedConnection
                property_hashtable.clear ();
        }
 
+       void set_selected (bool yn);
+
        virtual bool marked_for_display () const;
        virtual bool set_marked_for_display (bool);
 
        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 +92,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;
 
@@ -100,4 +104,3 @@ class AxisView : public virtual Selectable, public virtual PBD::ScopedConnection
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */
-