Heavy-duty abstraction work to split type-specific classes into

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 410474114a0c7c8fe38f378327edbea62d4363cd..246dbdc6473337501d943c82165bf8c175b27cdd 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -36,8 +36,6 @@ Editor::editor_mixer_button_toggled ()
        Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
-               bool yn = tact->get_active();
-               cerr << "button toggled, state = " << yn << endl;
                show_editor_mixer (tact->get_active());
        }
 }
@@ -133,7 +131,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
                /* might be nothing to do */
 
-               if (&current_mixer_strip->route() == &at->route()) {
+               if (current_mixer_strip->route() == at->route()) {
                        return;
                }
 
@@ -223,7 +221,7 @@ Editor::current_mixer_strip_hidden ()
                AudioTimeAxisView* tmp;
                
                if ((tmp = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                       if (&(tmp->route()) == &(current_mixer_strip->route())) {
+                       if (tmp->route() == current_mixer_strip->route()) {
                                (*i)->set_selected (false);
                                break;
                        }
@@ -258,6 +256,7 @@ Editor::session_going_away ()
        last_update_frame = 0;
        drag_info.item = 0;
        last_audition_region = 0;
+       last_canvas_frame = 0;
 
        /* hide all tracks */
 
@@ -271,8 +270,6 @@ Editor::session_going_away ()
        group_model->clear ();
 
        edit_cursor_clock.set_session (0);
-       selection_start_clock.set_session (0);
-       selection_end_clock.set_session (0);
        zoom_range_clock.set_session (0);
        nudge_clock.set_session (0);