remove UUIDs as implemention of PBD::ID, use static counter (not finished - counter...

[ardour.git] / gtk2_ardour / editor_route_list.cc

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 4ea2f54fabab2696e3d9419d9f9506d387ce9467..2e036f500189ac98e9a2ec2afd172b2733fb4d9b 100644 (file)
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -35,6 +35,7 @@
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 
 void
@@ -91,7 +92,7 @@ Editor::handle_new_route (Route& route)
        row[route_display_columns.text] = route.name();
        row[route_display_columns.visible] = tv->marked_for_display();
        row[route_display_columns.tv] = tv;
-               
+       
        track_views.push_back (tv);
 
        ignore_route_list_reorder = true;
@@ -177,7 +178,6 @@ Editor::hide_track_in_display (TimeAxisView& tv)
 {
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator i;
-       Glib::RefPtr<TreeSelection> selection = route_list_display.get_selection();
 
        for (i = rows.begin(); i != rows.end(); ++i) {
                if ((*i)[route_display_columns.tv] == &tv) { 
@@ -199,7 +199,6 @@ Editor::show_track_in_display (TimeAxisView& tv)
 {
        TreeModel::Children rows = route_display_model->children();
        TreeModel::Children::iterator i;
-       Glib::RefPtr<TreeSelection> selection = route_list_display.get_selection();
        
        for (i = rows.begin(); i != rows.end(); ++i) {
                if ((*i)[route_display_columns.tv] == &tv) { 
@@ -224,7 +223,7 @@ Editor::redisplay_route_list ()
        uint32_t position;
        uint32_t order;
        int n;
-
+       
        if (no_route_list_redisplay) {
                return;
        }
@@ -253,7 +252,7 @@ Editor::redisplay_route_list ()
                bool visible = (*i)[route_display_columns.visible];
 
                if (visible) {
-                       tv->set_marked_for_display (false);
+                       tv->set_marked_for_display (true);
                        position += tv->show_at (position, n, &edit_controls_vbox);
                        position += track_spacing;
                } else {
@@ -476,7 +475,7 @@ Editor::route_list_selection_filter (const Glib::RefPtr<TreeModel>& model, const
 struct EditorOrderRouteSorter {
     bool operator() (Route* a, Route* b) {
            /* use of ">" forces the correct sort order */
-           return a->order_key ("editor") > b->order_key ("editor");
+           return a->order_key ("editor") < b->order_key ("editor");
     }
 };