Fix non visibility of previously-visible MIDI automation

[ardour.git] / gtk2_ardour / editor_routes.cc

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 7044daa6ef497177e85bb0828efbac8f2335478e..714c5faad92a2da2363ef3507259fb47fc81006a 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -79,10 +79,10 @@ EditorRoutes::EditorRoutes (Editor* e)
        // Record enable toggle
        CellRendererPixbufMulti* rec_col_renderer = manage (new CellRendererPixbufMulti());
 
-       rec_col_renderer->set_pixbuf (0, ::get_icon("act-disabled"));
-       rec_col_renderer->set_pixbuf (1, ::get_icon("rec-in-progress"));
-       rec_col_renderer->set_pixbuf (2, ::get_icon("rec-enabled"));
-       rec_col_renderer->set_pixbuf (3, ::get_icon("step-editing"));
+       rec_col_renderer->set_pixbuf (0, ::get_icon("record-normal-disabled"));
+       rec_col_renderer->set_pixbuf (1, ::get_icon("record-normal-in-progress"));
+       rec_col_renderer->set_pixbuf (2, ::get_icon("record-normal-enabled"));
+       rec_col_renderer->set_pixbuf (3, ::get_icon("record-step"));
        rec_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_rec_enable_changed));
 
        TreeViewColumn* rec_state_column = manage (new TreeViewColumn("R", *rec_col_renderer));
@@ -98,7 +98,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        // MIDI Input Active
 
        CellRendererPixbufMulti* input_active_col_renderer = manage (new CellRendererPixbufMulti());
-       input_active_col_renderer->set_pixbuf (0, ::get_icon("act-disabled"));
+       input_active_col_renderer->set_pixbuf (0, ::get_icon("midi-input-inactive"));
        input_active_col_renderer->set_pixbuf (1, ::get_icon("midi-input-active"));
        input_active_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_input_active_changed));
 
@@ -474,10 +474,11 @@ EditorRoutes::redisplay ()
                if (visible) {
                        position += tv->show_at (position, n, &_editor->edit_controls_vbox);
                        tv->clip_to_viewport ();
-                       n++;
                } else {
                        tv->hide ();
                }
+
+               n++;
        }
 
        /* whenever we go idle, update the track view list to reflect the new order.
@@ -782,6 +783,8 @@ EditorRoutes::sync_order_keys (string const & src)
                        co.push_back (i->second);
                }
 
+               assert (co.size() == _model->children().size ());
+
                _model->reorder (co);
                _redisplay_does_not_reset_order_keys = false;
        }