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 a61707f91b0b596106ac8b9229e4434044d612b3..246dbdc6473337501d943c82165bf8c175b27cdd 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -95,14 +95,14 @@ Editor::show_editor_mixer (bool yn)
                }
                
                if (current_mixer_strip->get_parent() == 0) {
-
                        current_mixer_strip->set_embedded (true);
                        current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden));
                        current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed));
                        current_mixer_strip->set_width (editor_mixer_strip_width);
                        
                        global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
-                       global_hpacker.reorder_child (*current_mixer_strip, 0);
+                       global_hpacker.reorder_child (*current_mixer_strip, 0);
+
                        current_mixer_strip->show_all ();
                }
 
@@ -131,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;
                }
 
@@ -204,14 +204,6 @@ Editor::update_current_screen ()
        }
 }
 
-void
-Editor::update_slower ()
-{
-               if (current_mixer_strip) {
-                       current_mixer_strip->update ();
-               }
-}
-
 void
 Editor::current_mixer_strip_removed ()
 {
@@ -229,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;
                        }
@@ -264,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 */
 
@@ -277,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);