convert property_foo().set_value(bar) to property_foo() = bar

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 80838b3cc0bef8788a2f4ee00bca93ce70b0b92c..77d73de588ceac69075d2cb22522e8d35edca096 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -63,7 +63,7 @@ Editor::show_editor_mixer (bool yn)
                                                                                      *session,
                                                                                      atv->route(), false);
 
-                                               current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));                                            
+                                               current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));                                          
                                                break;
                                        }
                                }
@@ -77,7 +77,7 @@ Editor::show_editor_mixer (bool yn)
                                                current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
                                                                                      *session,
                                                                                      atv->route(), false);
-                                               current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));                                            
+                                               current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));                                          
                                                break;
                                        }
                                }
@@ -92,8 +92,8 @@ Editor::show_editor_mixer (bool yn)
                if (current_mixer_strip->get_parent() == 0) {
 
                        current_mixer_strip->set_embedded (true);
-                       current_mixer_strip->Hiding.connect (slot (*this, &Editor::current_mixer_strip_hidden));
-                       current_mixer_strip->GoingAway.connect (slot (*this, &Editor::current_mixer_strip_removed));
+                       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 ();
                        
@@ -141,7 +141,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
        current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
                                              *session,
                                              at->route());
-       current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+       current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
        
        if (show) {
                show_editor_mixer (true);
@@ -161,8 +161,7 @@ Editor::update_current_screen ()
 
                if (_follow_playhead) {
 
-                       gtk_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()) {
-                                       gtk_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);