Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / playlist_selector.cc

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 262890e6cb9c551c7b908a26f292bf80e770fc19..eb0e7e3203040cc7a23692383a7267b9181c65f6 100644 (file)
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -42,12 +42,11 @@ using namespace Gtk;
 using namespace ARDOUR;
 
 PlaylistSelector::PlaylistSelector ()
-       : ArdourDialog ("playlist selector"),
-         close_button (_("close"))
+       : ArdourDialog ("playlist selector")
 {
        rui = 0;
        
-       set_position (Gtk::WIN_POS_MOUSE);
+       set_position (WIN_POS_MOUSE);
        set_name ("PlaylistSelectorWindow");
        set_title (_("ardour: playlists"));
        set_modal(true);
@@ -59,16 +58,17 @@ PlaylistSelector::PlaylistSelector ()
        tree.append_column (_("Playlists grouped by track"), columns.text);
 
        scroller.add (tree);
-       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
 
-       close_button.signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
+       // GTK2FIX do we need this stuff or is GTK applying some policy now?
+       //set_border_width (6);
+       // set_spacing (12);
 
-       vpacker.set_border_width (6);
-       vpacker.set_spacing (12);
-       vpacker.pack_start (scroller);
-       vpacker.pack_start (close_button, false, false);
+       get_vbox()->pack_start (scroller);
+
+       Button* b = add_button (_("close"), RESPONSE_CANCEL);
+       b->signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
 
-       add (vpacker);
 }
 
 PlaylistSelector::~PlaylistSelector ()
@@ -102,13 +102,13 @@ PlaylistSelector::show_for (RouteUI* ruix)
        clear_map ();
        select_connection.disconnect ();
 
-       model.clear ();
+       model->clear ();
        
        session->foreach_playlist (this, &PlaylistSelector::add_playlist_to_map);
 
        this_ds = rui->get_diskstream();
 
-       Gtk::TreeModel::Row others = *(model->append ());
+       TreeModel::Row others = *(model->append ());
 
        others[columns.text] = _("Other tracks");
        others[columns.playlist] = 0;