Fix assertion failure when switching from a 2-channel to 1-channel route with the...

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 187443dab6d16ec9e6bad46afa2be7a658614e5a..21220d54396336632a9e416a24e36c9380831e87 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
@@ -49,13 +49,13 @@ class AxisView : public virtual Selectable
 
        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) {
                _marked_for_display = yn;
        }
-       
+
        sigc::signal<void> Hiding;
        sigc::signal<void> GoingAway;
 
@@ -66,7 +66,7 @@ class AxisView : public virtual Selectable
 
        AxisView (ARDOUR::Session& sess);
        virtual ~AxisView();
-       
+
 
        /**
         * Generate a new random TrackView color, unique from those colors already used.
@@ -79,7 +79,7 @@ class AxisView : public virtual Selectable
        ARDOUR::Session& _session;
        Gdk::Color _color;
 
-       static list<Gdk::Color> used_colors;
+       static std::list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;