X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=3a15e05c994fb0c8432d4aeb226ea1d3c7905c93;hb=900309993c485527145be4265247bd521073ee61;hp=38deece11a0da2b4a2ebf0c68ee8225648577eb9;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 38deece11a..3a15e05c99 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_gtk_axis_view_h__ @@ -28,6 +27,7 @@ #include #include "prompter.h" +#include "selectable.h" namespace ARDOUR { class Session; @@ -37,7 +37,7 @@ namespace ARDOUR { * AxisView defines the abstract base class for time-axis trackviews and routes. * */ -class AxisView : public virtual sigc::trackable +class AxisView : public virtual Selectable { public: /** @@ -51,24 +51,17 @@ class AxisView : public virtual sigc::trackable virtual string name() const = 0; - virtual void set_selected (bool yn) { - if (yn != _selected) { - _selected = yn; - } - } - virtual bool marked_for_display() const { return _marked_for_display; } - virtual void set_marked_for_display (bool yn) { - if (yn != _marked_for_display) { - _marked_for_display = yn; - } + _marked_for_display = yn; } - virtual bool selected() const { return _selected; } sigc::signal Hiding; sigc::signal GoingAway; + void set_old_order_key (uint32_t ok) { _old_order_key = ok; } + uint32_t old_order_key() const { return _old_order_key; } + protected: AxisView (ARDOUR::Session& sess); @@ -90,10 +83,9 @@ class AxisView : public virtual sigc::trackable Gtk::Label name_label; - bool _selected; - bool _marked_for_display; - + uint32_t _old_order_key; + }; /* class AxisView */ #endif /* __ardour_gtk_axis_view_h__ */