RCU-ification of AudioEngine port list, and DiskStreams. not well tested, but basical...

[ardour.git] / gtk2_ardour / playlist_selector.cc

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 262890e6cb9c551c7b908a26f292bf80e770fc19..68227d193c281fb0f07dc2de54643dd247a9bfa9 100644 (file)
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -22,7 +22,7 @@
 #include <gtkmm/button.h>
 
 #include <ardour/session_playlist.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/playlist.h>
 #include <ardour/audio_track.h>
 #include <ardour/audioplaylist.h>
@@ -40,14 +40,14 @@ using namespace std;
 using namespace sigc;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
 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 +59,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 ()
@@ -89,33 +90,33 @@ void
 PlaylistSelector::show_for (RouteUI* ruix)
 {
        vector<const char*> item;
-       DiskStream* this_ds;
+       boost::shared_ptr<Diskstream> this_ds;
        string str;
 
        rui = ruix;
 
        str = _("ardour: playlist for ");
-       str += rui->route().name();
+       str += rui->route()->name();
 
        set_title (str);
 
        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;
        
        for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
 
-               DiskStream* ds = session->diskstream_by_id (x->first);
+               boost::shared_ptr<Diskstream> ds = session->diskstream_by_id (x->first);
 
                if (ds == 0) {
                        continue;
@@ -188,7 +189,7 @@ PlaylistSelector::add_playlist_to_map (Playlist *pl)
 
        if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
 
-               pair<ARDOUR::id_t,list<Playlist*>*> newp (apl->get_orig_diskstream_id(), new list<Playlist*>);
+               pair<PBD::ID,list<Playlist*>*> newp (apl->get_orig_diskstream_id(), new list<Playlist*>);
                
                x = dspl_map.insert (dspl_map.end(), newp);
        }
@@ -222,7 +223,7 @@ PlaylistSelector::selection_changed ()
 
        TreeModel::iterator iter = tree.get_selection()->get_selected();
 
-       if (!iter) {
+       if (!iter || rui == 0) {
                /* nothing selected */
                return;
        }
@@ -232,7 +233,7 @@ PlaylistSelector::selection_changed ()
                AudioTrack* at;
                AudioPlaylist* apl;
                
-               if ((at = dynamic_cast<AudioTrack*> (&rui->route())) == 0) {
+               if ((at = rui->audio_track()) == 0) {
                        /* eh? */
                        return;
                }
@@ -242,7 +243,7 @@ PlaylistSelector::selection_changed ()
                        return;
                }
                
-               at->disk_stream().use_playlist (apl);
+               at->diskstream()->use_playlist (apl);
 
                hide ();
        }