more gcc 4.1 complaints, route_list is a ListStore

git-svn-id: svn://localhost/trunk/ardour2@256 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 20a7ca360adab442026349ff06391fc005391ff8..08df7d6c75e1e37a0274cf965544bb29e1759f6d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -522,7 +522,7 @@ Editor::Editor (AudioEngine& eng)
        bottom_hbox.set_border_width (3);
        bottom_hbox.set_spacing (3);
 
-       route_display_model = TreeStore::create(route_display_columns);
+       route_display_model = ListStore::create(route_display_columns);
        route_list_display.set_model (route_display_model);
        route_list_display.append_column (_("Visible"), route_display_columns.visible);
        route_list_display.append_column (_("Name"), route_display_columns.text);

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 1592cb4dda5ce30f271fc8eb6858236b313c6515..ccd1ddb0fae1054511b01122fd147894b70db84b 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1454,7 +1454,7 @@ class Editor : public PublicEditor
        };
 
        RouteDisplayModelColumns         route_display_columns;
-       Glib::RefPtr<Gtk::TreeStore>     route_display_model;
+       Glib::RefPtr<Gtk::ListStore>     route_display_model;
        Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
 
        gint route_list_compare_func (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index ed4b695bffde34f86914a055a3b8aee8e9de73cd..7afc84e74ac2571233a7249a7e2796c444c846bb 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -57,9 +57,9 @@ enum mute_type {
 
 class Route : public IO
 {
-  private:
-       typedef list<Redirect *> RedirectList;
+  protected:
 
+        typedef list<Redirect *> RedirectList;
   public:
 
        enum Flag {