changes to help strp silence

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 5fc6917b7497dffdbbffe1bfa8cb0028e66cb751..108d14c1f12f7fb358a5fcedf6bb8e1a89f2d5e5 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,16 +15,23 @@
     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__
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
-#include <gtk--.h>
-#include <pbd/xml++.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
+#include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
 #include "prompter.h"
+#include "selectable.h"
 
 namespace ARDOUR {
        class Session;
@@ -34,7 +41,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public SigC::Object
+class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
        /**
@@ -42,55 +49,44 @@ class AxisView : public SigC::Object
         *
         * @return the current Track Color
         */
-       Gdk_Color color() const { return _color; }
+       Gdk::Color color() const { return _color; }
 
-       ARDOUR::Session& session() const { return _session; }
+       ARDOUR::Session* session() const { return _session; }
 
-       virtual string name() const = 0;
+       virtual std::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::Signal0<void> Hiding;
-       SigC::Signal0<void> GoingAway;
+       sigc::signal<void> Hiding;
+
+       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);
+       AxisView (ARDOUR::Session* sess);
        virtual ~AxisView();
-       
 
        /**
         * Generate a new random TrackView color, unique from those colors already used.
         *
         * @return the unique random color.
         */
-       static GdkColor unique_random_color();
+       static Gdk::Color unique_random_color();
 
 
-       ARDOUR::Session& _session;
-       Gdk_Color _color;
+       Gdk::Color _color;
 
-       static list<GdkColor> used_colors;
+       static std::list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;
 
-       bool _selected;
-
        bool _marked_for_display;
-       
+       uint32_t _old_order_key;
+
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */