first pass on track mode switch; fixes to dangling region refs after capture; destroy...

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 410474114a0c7c8fe38f378327edbea62d4363cd..52f48b81740d1730aa0a5f31900a643c7daa3209 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());
        }
 }
@@ -51,15 +49,18 @@ Editor::cms_deleted ()
 void
 Editor::show_editor_mixer (bool yn)
 {
+       show_editor_mixer_when_tracks_arrive = false;
+
        if (yn) {
 
                if (current_mixer_strip == 0) {
 
                        if (selection->tracks.empty()) {
                                
-                               if (track_views.empty()) {
+                               if (track_views.empty()) {      
+                                       show_editor_mixer_when_tracks_arrive = true;
                                        return;
-                               }
+                               } 
                                
                                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                                        AudioTimeAxisView* atv;
@@ -133,7 +134,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;
                }
 
@@ -159,7 +160,7 @@ Editor::update_current_screen ()
 {
        if (session && engine.running()) {
 
-               jack_nframes_t frame;
+               nframes_t frame;
 
                frame = session->audible_frame();
 
@@ -223,7 +224,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;
                        }
@@ -257,7 +258,7 @@ Editor::session_going_away ()
        latest_regionview = 0;
        last_update_frame = 0;
        drag_info.item = 0;
-       last_audition_region = 0;
+       last_canvas_frame = 0;
 
        /* hide all tracks */
 
@@ -271,8 +272,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);