Add debug bit for AudioBackends for port related debug output
[ardour.git] / gtk2_ardour / editor_routes.cc
index 4f439a43878a60f6af030b5a007075661357730f..b249c0a100364ac4ce631e1336d295286e0411dc 100644 (file)
 
 */
 
+#include <cstdlib>
+#include <cassert>
+#include <cmath>
 #include <list>
 #include <vector>
 #include <algorithm>
-#include <cstdlib>
-#include <cmath>
-#include <cassert>
 
 #include "pbd/unknown_type.h"
 #include "pbd/unwind.h"
 
 #include "ardour/debug.h"
-#include "ardour/route.h"
 #include "ardour/midi_track.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
 
 #include "gtkmm2ext/cell_renderer_pixbuf_multi.h"
 #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
 #include "gtkmm2ext/treeutils.h"
 
-#include "editor.h"
-#include "keyboard.h"
+#include "actions.h"
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
+#include "editor.h"
+#include "editor_group_tabs.h"
+#include "editor_routes.h"
+#include "gui_thread.h"
+#include "keyboard.h"
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
-#include "gui_thread.h"
-#include "actions.h"
-#include "utils.h"
 #include "route_sorter.h"
-#include "editor_group_tabs.h"
-#include "editor_routes.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -61,23 +61,24 @@ using namespace Glib;
 using Gtkmm2ext::Keyboard;
 
 struct ColumnInfo {
-    int         index;
-    const char* label;
-    const char* tooltip;
+       int         index;
+       const char* label;
+       const char* tooltip;
 };
 
 EditorRoutes::EditorRoutes (Editor* e)
        : EditorComponent (e)
-        , _ignore_reorder (false)
-        , _no_redisplay (false)
-        , _adding_routes (false)
-        , _route_deletion_in_progress (false)
-        , _redisplay_active (0)
-        , _queue_tv_update (0)
-        , _menu (0)
-        , old_focus (0)
-        , selection_countdown (0)
-        , name_editable (0)
+       , _ignore_reorder (false)
+       , _no_redisplay (false)
+       , _adding_routes (false)
+       , _route_deletion_in_progress (false)
+       , _redisplay_on_resume (false)
+       , _redisplay_active (0)
+       , _queue_tv_update (0)
+       , _menu (0)
+       , old_focus (0)
+       , selection_countdown (0)
+       , name_editable (0)
 {
        static const int column_width = 22;
 
@@ -187,7 +188,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        solo_safe_state_column->set_expand(false);
        solo_safe_state_column->set_fixed_width(column_width);
 
-        _name_column = _display.append_column ("", _columns.text) - 1;
+       _name_column = _display.append_column ("", _columns.text) - 1;
        _visible_column = _display.append_column ("", _columns.visible) - 1;
        _active_column = _display.append_column ("", _columns.active) - 1;
 
@@ -203,15 +204,15 @@ EditorRoutes::EditorRoutes (Editor* e)
        Gtk::Label* l;
 
        ColumnInfo ci[] = {
-               { 0, _("Name"), _("Track/Bus Name") },
-               { 1, _("V"), _("Track/Bus visible ?") },
-               { 2, _("A"), _("Track/Bus active ?") },
-               { 3, _("I"), _("MIDI input enabled") },
-               { 4, _("R"), _("Record enabled") },
-               { 5, _("M"), _("Muted") },
-               { 6, _("S"), _("Soloed") },
-               { 7, _("SI"), _("Solo Isolated") },
-               { 8, _("SS"), _("Solo Safe (Locked)") },
+               { 0,  _("Name"),        _("Track/Bus Name") },
+               { 1, S_("Visible|V"),   _("Track/Bus visible ?") },
+               { 2, S_("Active|A"),    _("Track/Bus active ?") },
+               { 3, S_("MidiInput|I"), _("MIDI input enabled") },
+               { 4, S_("Rec|R"),       _("Record enabled") },
+               { 5, S_("Mute|M"),      _("Muted") },
+               { 6, S_("Solo|S"),      _("Soloed") },
+               { 7, S_("SoloIso|SI"),  _("Solo Isolated") },
+               { 8, S_("SoloLock|SS"), _("Solo Safe (Locked)") },
                { -1, 0, 0 }
        };
 
@@ -236,7 +237,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (_name_column));
 
        assert (name_cell);
-        name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit_started));
+       name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit_started));
 
        TreeViewColumn* name_column = _display.get_column (_name_column);
 
@@ -274,20 +275,20 @@ EditorRoutes::EditorRoutes (Editor* e)
        active_col->set_sizing (TREE_VIEW_COLUMN_FIXED);
        active_col->set_fixed_width (30);
        active_col->set_alignment (ALIGN_CENTER);
-       
+
        _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRoutes::row_deleted));
        _model->signal_rows_reordered().connect (sigc::mem_fun (*this, &EditorRoutes::reordered));
 
        _display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorRoutes::button_press), false);
        _scroller.signal_key_press_event().connect (sigc::mem_fun(*this, &EditorRoutes::key_press), false);
 
-        _scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_in), false);
-        _scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_out));
+       _scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_in), false);
+       _scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_out));
 
-        _display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::enter_notify), false);
-        _display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::leave_notify), false);
+       _display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::enter_notify), false);
+       _display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::leave_notify), false);
 
-        _display.set_enable_search (false);
+       _display.set_enable_search (false);
 
        Route::SyncOrderKeys.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::sync_treeview_from_order_keys, this), gui_context());
 }
@@ -295,29 +296,29 @@ EditorRoutes::EditorRoutes (Editor* e)
 bool
 EditorRoutes::focus_in (GdkEventFocus*)
 {
-        Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
+       Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
 
-        if (win) {
-                old_focus = win->get_focus ();
-        } else {
-                old_focus = 0;
-        }
+       if (win) {
+               old_focus = win->get_focus ();
+       } else {
+               old_focus = 0;
+       }
 
-        name_editable = 0;
+       name_editable = 0;
 
-        /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
-        return true;
+       /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
+       return true;
 }
 
 bool
 EditorRoutes::focus_out (GdkEventFocus*)
 {
-        if (old_focus) {
-                old_focus->grab_focus ();
-                old_focus = 0;
-        }
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
 
-        return false;
+       return false;
 }
 
 bool
@@ -327,27 +328,27 @@ EditorRoutes::enter_notify (GdkEventCrossing*)
                return true;
        }
 
-        /* arm counter so that ::selection_filter() will deny selecting anything for the
-           next two attempts to change selection status.
-        */
-        selection_countdown = 2;
-        _scroller.grab_focus ();
-        Keyboard::magic_widget_grab_focus ();
-        return false;
+       /* arm counter so that ::selection_filter() will deny selecting anything for the
+        * next two attempts to change selection status.
+        */
+       selection_countdown = 2;
+       _scroller.grab_focus ();
+       Keyboard::magic_widget_grab_focus ();
+       return false;
 }
 
 bool
 EditorRoutes::leave_notify (GdkEventCrossing*)
 {
-        selection_countdown = 0;
+       selection_countdown = 0;
 
-        if (old_focus) {
-                old_focus->grab_focus ();
-                old_focus = 0;
-        }
+       if (old_focus) {
+               old_focus->grab_focus ();
+               old_focus = 0;
+       }
 
-        Keyboard::magic_widget_drop_focus ();
-        return false;
+       Keyboard::magic_widget_drop_focus ();
+       return false;
 }
 
 void
@@ -360,6 +361,13 @@ EditorRoutes::set_session (Session* s)
        if (_session) {
                _session->SoloChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::solo_changed_so_update_mute, this), gui_context());
                _session->RecordStateChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context());
+
+               /* TODO: check if these needs to be tied in with DisplaySuspender
+                * Given that the UI is single-threaded and DisplaySuspender is only used
+                * in loops in the UI thread all should be fine.
+                */
+               _session->BatchUpdateStart.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::suspend_redisplay, this), gui_context());
+               _session->BatchUpdateEnd.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::resume_redisplay, this), gui_context());
        }
 }
 
@@ -516,7 +524,7 @@ EditorRoutes::redisplay_real ()
                }
 
                bool visible = tv->marked_for_display ();
-
+               
                /* show or hide the TimeAxisView */
                if (visible) {
                        position += tv->show_at (position, n, &_editor->edit_controls_vbox);
@@ -549,21 +557,25 @@ EditorRoutes::redisplay_real ()
 void
 EditorRoutes::redisplay ()
 {
-       if (_no_redisplay || !_session || _session->deletion_in_progress()) {
+       if (!_session || _session->deletion_in_progress()) {
+               return;
+       }
+
+       if (_no_redisplay) {
+               _redisplay_on_resume = true;
                return;
        }
 
        // model deprecated g_atomic_int_exchange_and_add(, 1)
        g_atomic_int_inc(&_redisplay_active);
        if (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 1)) {
-               printf ("SKIP redisplay\n");
                return;
        }
 
        redisplay_real ();
 
        while (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 0)) {
-               g_atomic_pointer_set(&_redisplay_active, 1);
+               g_atomic_int_set(&_redisplay_active, 1);
                redisplay_real ();
        }
 }
@@ -572,14 +584,14 @@ void
 EditorRoutes::row_deleted (Gtk::TreeModel::Path const &)
 {
        /* this happens as the second step of a DnD within the treeview, and
-          when a route is actually removed. we don't differentiate between
-          the two cases.
-          
-          note that the sync_orders_keys() step may not actually change any
-          RID's (e.g. the last track may be removed, so all other tracks keep
-          the same RID), which means that no redisplay would happen. so we 
-           have to force a redisplay.
-       */
+        * when a route is actually removed. we don't differentiate between
+        * the two cases.
+        *
+        * note that the sync_orders_keys() step may not actually change any
+        * RID's (e.g. the last track may be removed, so all other tracks keep
+        * the same RID), which means that no redisplay would happen. so we
+        * have to force a redisplay.
+        */
 
        DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview row deleted\n");
 
@@ -637,7 +649,6 @@ void
 EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 {
        PBD::Unwinder<bool> at (_adding_routes, true);
-
        bool from_scratch = (_model->children().size() == 0);
        Gtk::TreeModel::Children::iterator insert_iter = _model->children().end();
 
@@ -650,10 +661,6 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
                }
        }
 
-       if(!from_scratch) {
-               _editor->selection->tracks.clear();
-       } 
-
        DisplaySuspender ds;
 
        _display.set_model (Glib::RefPtr<ListStore>());
@@ -686,10 +693,6 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
                row[_columns.solo_safe_state] = (*x)->route()->solo_safe();
                row[_columns.name_editable] = true;
 
-               if (!from_scratch) {
-                       _editor->selection->add(*x);
-               }
-
                boost::weak_ptr<Route> wr ((*x)->route());
 
                (*x)->route()->gui_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::handle_gui_changes, this, _1, _2), gui_context());
@@ -700,12 +703,12 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
                        t->RecordEnableChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context());
                }
 
-               if ((*x)->is_midi_track()) {
-                       boost::shared_ptr<MidiTrack> t = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route());
+               if ((*x)->is_midi_track()) {
+                       boost::shared_ptr<MidiTrack> t = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route());
                        t->StepEditStatusChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context());
-                       t->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context());
-               }
+                       t->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context());
+               }
+
                (*x)->route()->mute_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context());
                (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context());
                (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context());
@@ -726,8 +729,9 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
        _display.set_model (_model);
 
        /* now update route order keys from the treeview/track display order */
-
-       sync_order_keys_from_treeview ();
+       if (!from_scratch) {
+               sync_order_keys_from_treeview ();
+       }
 }
 
 void
@@ -765,7 +769,7 @@ EditorRoutes::route_removed (TimeAxisView *tv)
                }
        }
 
-       /* the deleted signal for the treeview/model will take 
+       /* the deleted signal for the treeview/model will take
           care of any updates.
        */
 }
@@ -811,7 +815,7 @@ EditorRoutes::update_visibility ()
        TreeModel::Children rows = _model->children();
        TreeModel::Children::iterator i;
 
-       DisplaySuspender ds ();
+       DisplaySuspender ds;
 
        for (i = rows.begin(); i != rows.end(); ++i) {
                TimeAxisView *tv = (*i)[_columns.tv];
@@ -865,12 +869,12 @@ EditorRoutes::reset_remote_control_ids ()
        }
 
        TreeModel::Children rows = _model->children();
-       
+
        if (rows.empty()) {
                return;
        }
 
-       
+
        DEBUG_TRACE (DEBUG::OrderKeys, "editor reset remote control ids\n");
 
        TreeModel::Children::iterator ri;
@@ -880,19 +884,28 @@ EditorRoutes::reset_remote_control_ids ()
 
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
 
+               /* skip two special values */
+               
+               if (rid == Route::MasterBusRemoteControlID) {
+                       rid++;
+               }
+               
+               if (rid == Route::MonitorBusRemoteControlID) {
+                       rid++;
+               }
+
                boost::shared_ptr<Route> route = (*ri)[_columns.route];
                bool visible = (*ri)[_columns.visible];
 
-
                if (!route->is_master() && !route->is_monitor()) {
 
                        uint32_t new_rid = (visible ? rid : invisible_key--);
 
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_explicit (new_rid);        
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -915,12 +928,12 @@ EditorRoutes::sync_order_keys_from_treeview ()
        }
 
        TreeModel::Children rows = _model->children();
-       
+
        if (rows.empty()) {
                return;
        }
 
-       
+
        DEBUG_TRACE (DEBUG::OrderKeys, "editor sync order keys from treeview\n");
 
        TreeModel::Children::iterator ri;
@@ -948,10 +961,10 @@ EditorRoutes::sync_order_keys_from_treeview ()
                        uint32_t new_rid = (visible ? rid : invisible_key--);
 
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_explicit (new_rid);        
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -960,7 +973,7 @@ EditorRoutes::sync_order_keys_from_treeview ()
 
                ++order;
        }
-       
+
        if (changed) {
                /* tell the world that we changed the editor sort keys */
                _session->sync_order_keys ();
@@ -975,7 +988,7 @@ EditorRoutes::sync_order_keys_from_treeview ()
 void
 EditorRoutes::sync_treeview_from_order_keys ()
 {
-       /* Some route order key(s) have been changed, make sure that 
+       /* Some route order key(s) have been changed, make sure that
           we update out tree/list model and GUI to reflect the change.
        */
 
@@ -1012,7 +1025,7 @@ EditorRoutes::sync_treeview_from_order_keys ()
        neworder.assign (sorted_routes.size(), 0);
 
        uint32_t n = 0;
-       
+
        for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) {
 
                neworder[n] = sr->old_display_order;
@@ -1189,59 +1202,58 @@ EditorRoutes::hide_all_miditracks ()
 bool
 EditorRoutes::key_press (GdkEventKey* ev)
 {
-        TreeViewColumn *col;
-        boost::shared_ptr<RouteList> rl (new RouteList);
-        TreePath path;
-
-        switch (ev->keyval) {
-        case GDK_Tab:
-        case GDK_ISO_Left_Tab:
-
-                /* If we appear to be editing something, leave that cleanly and appropriately.
-                */
-                if (name_editable) {
-                        name_editable->editing_done ();
-                        name_editable = 0;
-                }
-
-                col = _display.get_column (_name_column); // select&focus on name column
-
-                if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                        treeview_select_previous (_display, _model, col);
-                } else {
-                        treeview_select_next (_display, _model, col);
-                }
-
-                return true;
-                break;
-
-        case 'm':
-                if (get_relevant_routes (rl)) {
-                        _session->set_mute (rl, !rl->front()->muted(), Session::rt_cleanup);
-                }
-                return true;
-                break;
-
-        case 's':
-                if (get_relevant_routes (rl)) {
-                       if (Config->get_solo_control_is_listen_control()) {
-                               _session->set_listen (rl, !rl->front()->listening_via_monitor(), Session::rt_cleanup);
+       TreeViewColumn *col;
+       boost::shared_ptr<RouteList> rl (new RouteList);
+       TreePath path;
+
+       switch (ev->keyval) {
+               case GDK_Tab:
+               case GDK_ISO_Left_Tab:
+
+                       /* If we appear to be editing something, leave that cleanly and appropriately. */
+                       if (name_editable) {
+                               name_editable->editing_done ();
+                               name_editable = 0;
+                       }
+
+                       col = _display.get_column (_name_column); // select&focus on name column
+
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                               treeview_select_previous (_display, _model, col);
                        } else {
-                               _session->set_solo (rl, !rl->front()->self_soloed(), Session::rt_cleanup);
+                               treeview_select_next (_display, _model, col);
                        }
-               }
-                return true;
-                break;
 
-        case 'r':
-                if (get_relevant_routes (rl)) {
-                        _session->set_record_enabled (rl, !rl->front()->record_enabled(), Session::rt_cleanup);
-                }
-                break;
+                       return true;
+                       break;
 
-        default:
-                break;
-        }
+               case 'm':
+                       if (get_relevant_routes (rl)) {
+                               _session->set_mute (rl, !rl->front()->muted(), Session::rt_cleanup);
+                       }
+                       return true;
+                       break;
+
+               case 's':
+                       if (get_relevant_routes (rl)) {
+                               if (Config->get_solo_control_is_listen_control()) {
+                                       _session->set_listen (rl, !rl->front()->listening_via_monitor(), Session::rt_cleanup);
+                               } else {
+                                       _session->set_solo (rl, !rl->front()->self_soloed(), Session::rt_cleanup);
+                               }
+                       }
+                       return true;
+                       break;
+
+               case 'r':
+                       if (get_relevant_routes (rl)) {
+                               _session->set_record_enabled (rl, !rl->front()->record_enabled(), Session::rt_cleanup);
+                       }
+                       break;
+
+               default:
+                       break;
+       }
 
        return false;
 }
@@ -1249,44 +1261,44 @@ EditorRoutes::key_press (GdkEventKey* ev)
 bool
 EditorRoutes::get_relevant_routes (boost::shared_ptr<RouteList> rl)
 {
-        TimeAxisView* tv;
-        RouteTimeAxisView* rtv;
+       TimeAxisView* tv;
+       RouteTimeAxisView* rtv;
        RefPtr<TreeSelection> selection = _display.get_selection();
-        TreePath path;
-        TreeIter iter;
+       TreePath path;
+       TreeIter iter;
 
-        if (selection->count_selected_rows() != 0) {
+       if (selection->count_selected_rows() != 0) {
 
-                /* use selection */
+               /* use selection */
 
-                RefPtr<TreeModel> tm = RefPtr<TreeModel>::cast_dynamic (_model);
-                iter = selection->get_selected (tm);
+               RefPtr<TreeModel> tm = RefPtr<TreeModel>::cast_dynamic (_model);
+               iter = selection->get_selected (tm);
 
-        } else {
-                /* use mouse pointer */
+       } else {
+               /* use mouse pointer */
 
-                int x, y;
-                int bx, by;
+               int x, y;
+               int bx, by;
 
-                _display.get_pointer (x, y);
-                _display.convert_widget_to_bin_window_coords (x, y, bx, by);
+               _display.get_pointer (x, y);
+               _display.convert_widget_to_bin_window_coords (x, y, bx, by);
 
-                if (_display.get_path_at_pos (bx, by, path)) {
-                        iter = _model->get_iter (path);
-                }
-        }
+               if (_display.get_path_at_pos (bx, by, path)) {
+                       iter = _model->get_iter (path);
+               }
+       }
 
-        if (iter) {
-                tv = (*iter)[_columns.tv];
-                if (tv) {
-                        rtv = dynamic_cast<RouteTimeAxisView*>(tv);
-                        if (rtv) {
-                                rl->push_back (rtv->route());
-                        }
-                }
-        }
+       if (iter) {
+               tv = (*iter)[_columns.tv];
+               if (tv) {
+                       rtv = dynamic_cast<RouteTimeAxisView*>(tv);
+                       if (rtv) {
+                               rl->push_back (rtv->route());
+                       }
+               }
+       }
 
-        return !rl->empty();
+       return !rl->empty();
 }
 
 bool
@@ -1327,6 +1339,8 @@ EditorRoutes::button_press (GdkEventButton* ev)
 void
 EditorRoutes::selection_changed ()
 {
+       _editor->begin_reversible_selection_op (X_("Select Track from Route List"));
+
        if (_display.get_selection()->count_selected_rows() > 0) {
 
                TreeIter iter;
@@ -1342,7 +1356,7 @@ EditorRoutes::selection_changed ()
                                TimeAxisView* tv = (*iter)[_columns.tv];
                                selected.push_back (tv);
                        }
-                       
+
                }
 
                _editor->get_selection().set (selected);
@@ -1351,33 +1365,36 @@ EditorRoutes::selection_changed ()
        } else {
                _editor->get_selection().clear_tracks ();
        }
+
+       _editor->commit_reversible_selection_op ();
 }
 
 bool
 EditorRoutes::selection_filter (Glib::RefPtr<TreeModel> const &, TreeModel::Path const&, bool /*selected*/)
 {
-        if (selection_countdown) {
-                if (--selection_countdown == 0) {
-                        return true;
-                } else {
-                        /* no selection yet ... */
-                        return false;
-                }
-        }
+       if (selection_countdown) {
+               if (--selection_countdown == 0) {
+                       return true;
+               } else {
+                       /* no selection yet ... */
+                       return false;
+               }
+       }
        return true;
 }
 
-struct EditorOrderRouteSorter {
-    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           if (a->is_master()) {
-                   /* master before everything else */
-                   return true;
-           } else if (b->is_master()) {
-                   /* everything else before master */
-                   return false;
-           }
-           return a->order_key () < b->order_key ();
-    }
+struct EditorOrderRouteSorter
+{
+       bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+               if (a->is_master()) {
+                       /* master before everything else */
+                       return true;
+               } else if (b->is_master()) {
+                       /* everything else before master */
+                       return false;
+               }
+               return a->order_key () < b->order_key ();
+       }
 };
 
 void
@@ -1390,29 +1407,10 @@ EditorRoutes::initial_display ()
                return;
        }
 
-       boost::shared_ptr<RouteList> routes = _session->get_routes();
-
-       if (ARDOUR_UI::instance()->session_is_new ()) {
-
-               /* new session: stamp all routes with the right editor order
-                * key
-                */
-
-               _editor->add_routes (*(routes.get()));
+       RouteList r (*_session->get_routes());
                
-       } else {
-
-               /* existing session: sort a copy of the route list by
-                * editor-order and add its contents to the display.
-                */
-
-               RouteList r (*routes);
-               EditorOrderRouteSorter sorter;
-               
-               r.sort (sorter);
-               _editor->add_routes (r);
-               
-       }
+       r.sort (EditorOrderRouteSorter ());
+       _editor->add_routes (r);
 }
 
 void
@@ -1550,7 +1548,7 @@ EditorRoutes::move_selected_tracks (bool up)
                }
                assert (*i < (int) neworder.size ());
        }
-#endif 
+#endif
 
        _model->reorder (neworder);
 }
@@ -1566,7 +1564,7 @@ EditorRoutes::update_input_active_display ()
 
                if (boost::dynamic_pointer_cast<Track> (route)) {
                        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
-                       
+
                        if (mt) {
                                (*i)[_columns.is_input_active] = mt->input_active();
                        }
@@ -1596,26 +1594,25 @@ EditorRoutes::idle_update_mute_rec_solo_etc()
                (*i)[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (route) ? 1 : 0;
                (*i)[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (route) ? 1 : 0;
                (*i)[_columns.active] = route->active ();
-               {
-                       if (boost::dynamic_pointer_cast<Track> (route)) {
-                               boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
-
-                               if (route->record_enabled()) {
-                                       if (_session->record_status() == Session::Recording) {
-                                               (*i)[_columns.rec_state] = 1;
-                                       } else {
-                                               (*i)[_columns.rec_state] = 2;
-                                       }
-                               } else if (mt && mt->step_editing()) {
-                                       (*i)[_columns.rec_state] = 3;
+               if (boost::dynamic_pointer_cast<Track> (route)) {
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
+                       
+                       if (route->record_enabled()) {
+                               if (_session->record_status() == Session::Recording) {
+                                       (*i)[_columns.rec_state] = 1;
                                } else {
-                                       (*i)[_columns.rec_state] = 0;
+                                       (*i)[_columns.rec_state] = 2;
                                }
-
-                               (*i)[_columns.name_editable] = !route->record_enabled ();
+                       } else if (mt && mt->step_editing()) {
+                               (*i)[_columns.rec_state] = 3;
+                       } else {
+                               (*i)[_columns.rec_state] = 0;
                        }
+                       
+                       (*i)[_columns.name_editable] = !route->record_enabled ();
                }
        }
+
        return false; // do not call again (until needed)
 }
 
@@ -1674,21 +1671,21 @@ EditorRoutes::clear ()
 void
 EditorRoutes::name_edit_started (CellEditable* ce, const Glib::ustring&)
 {
-        name_editable = ce;
+       name_editable = ce;
 
-        /* give it a special name */
+       /* give it a special name */
 
-        Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ce);
+       Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ce);
 
-        if (e) {
-                e->set_name (X_("RouteNameEditorEntry"));
-        }
+       if (e) {
+               e->set_name (X_("RouteNameEditorEntry"));
+       }
 }
 
 void
 EditorRoutes::name_edit (std::string const & path, std::string const & new_text)
 {
-        name_editable = 0;
+       name_editable = 0;
 
        TreeIter iter = _model->get_iter (path);