remove Glib::ustring from gtk2_ardour

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 3a15e05c994fb0c8432d4aeb226ea1d3c7905c93..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
@@ -25,7 +25,11 @@
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
 #include "prompter.h"
 #include "selectable.h"
 
@@ -37,7 +41,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public virtual Selectable
+class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
        /**
@@ -47,9 +51,9 @@ class AxisView : public virtual Selectable
         */
        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 bool marked_for_display() const { return _marked_for_display; }
        virtual void set_marked_for_display (bool yn) {
@@ -57,16 +61,14 @@ class AxisView : public virtual Selectable
        }
        
        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);
+       AxisView (ARDOUR::Session* sess);
        virtual ~AxisView();
-       
 
        /**
         * Generate a new random TrackView color, unique from those colors already used.
@@ -76,10 +78,9 @@ class AxisView : public virtual Selectable
        static Gdk::Color unique_random_color();
 
 
-       ARDOUR::Session& _session;
        Gdk::Color _color;
 
-       static list<Gdk::Color> used_colors;
+       static std::list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;