menu and action update

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index cd51182126af1228476032a79da020c013b12d89..70df0b1bf992a225dacef85bf9f38208cf7fec9e 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -161,8 +161,7 @@ Editor::update_current_screen ()
 
                if (_follow_playhead) {
 
-                       gnome_canvas_item_show (playhead_cursor->canvas_item);
-
+                 playhead_cursor->canvas_item.show();
                        if (frame != last_update_frame) {
 
                                if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
@@ -185,7 +184,7 @@ Editor::update_current_screen ()
                        
                        if (frame != last_update_frame) {
                                if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
-                                       gnome_canvas_item_hide (playhead_cursor->canvas_item);
+                                       playhead_cursor->canvas_item.hide();
                                } else {
                                        playhead_cursor->set_position (frame);
                                }
@@ -253,11 +252,9 @@ Editor::session_going_away ()
        entered_regionview = 0;
        entered_track = 0;
        latest_regionview = 0;
-       region_list_display_drag_region = 0;
        last_update_frame = 0;
        drag_info.item = 0;
        last_audition_region = 0;
-       region_list_button_region = 0;
 
        /* hide all tracks */
 
@@ -266,9 +263,9 @@ Editor::session_going_away ()
        /* rip everything out of the list displays */
 
        region_list_clear (); // no clear() method in gtkmm 1.2 
-       route_list.clear ();
-       named_selection_display.clear ();
-       edit_group_list.clear ();
+       route_display_model->clear ();
+       named_selection_model->clear ();
+       group_model->clear ();
 
        edit_cursor_clock.set_session (0);
        selection_start_clock.set_session (0);
@@ -291,14 +288,6 @@ Editor::session_going_away ()
                current_bbt_points = 0;
        }
 
-       if (embed_audio_item) {
-               embed_audio_item->set_sensitive (false);
-       } 
-
-       if (import_audio_item) {
-               import_audio_item->set_sensitive (false);
-       }
-
        /* mixer strip will be deleted all by itself 
           when its route is deleted.
        */