Move duplicated AudioFileSource::Flags and SMFSource::Flags into Source.

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index fccb48e911f7400ab4fee879a6f53834846022ab..3a15e05c994fb0c8432d4aeb226ea1d3c7905c93 100644 (file)
--- 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,16 +27,17 @@
 
 #include <pbd/xml++.h>
 #include "prompter.h"
+#include "selectable.h"
 
 namespace ARDOUR {
        class Session;
 }
 
 /**
- * The abstract base class for time-axis trackviews and routes.
+ * 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<void> Hiding;
        sigc::signal<void> 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__ */