X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=ec1511f2a2434069e4f6f4baebbb3b45b5cff46b;hb=a7055e0863ff8cd9054eb88fcf3b292e385408a7;hp=d73f0aa29746e7ba889133a4b9e470475e7e6dcf;hpb=c71fc0272da4196f4bc14060f2c6bddcce76f823;p=ardour.git

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index d73f0aa297..ec1511f2a2 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -95,16 +95,16 @@ Editor::show_editor_mixer (bool yn)
 			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);
-			current_mixer_strip->show_all ();
 			
-			global_hpacker.pack_start (*current_mixer_strip, false, false);
+			global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
 			global_hpacker.reorder_child (*current_mixer_strip, 0);
+			current_mixer_strip->show_all ();
 		}
 
 	} else {
 
 		if (current_mixer_strip) {
-			editor_mixer_strip_width = current_mixer_strip->get_width ();
+		        editor_mixer_strip_width = current_mixer_strip->get_width ();
 			if (current_mixer_strip->get_parent() != 0) {
 				global_hpacker.remove (*current_mixer_strip);
 			}
@@ -133,7 +133,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		if (current_mixer_strip->get_parent()) {
 			show = true;
 		}
-
 		delete current_mixer_strip;
 		current_mixer_strip = 0;
 	}
@@ -161,8 +160,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 +183,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);
 				}
@@ -264,9 +262,9 @@ Editor::session_going_away ()
 	/* rip everything out of the list displays */
 
 	region_list_clear (); // no clear() method in gtkmm 1.2 
-	route_display_model.clear ();
-	named_selection_model.clear ();
-	group_model.clear ();
+	route_display_model->clear ();
+	named_selection_model->clear ();
+	group_model->clear ();
 
 	edit_cursor_clock.set_session (0);
 	selection_start_clock.set_session (0);
@@ -289,14 +287,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.
 	*/