X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=d02c5a88de7d941f57634e38927e136004e0504e;hb=1bddf1bc884feedb5deb5c35f08c7b9730936dae;hp=870fa2df5f18e85063ce011388d3b9bfa80edbab;hpb=b09ab546542040b1d468c9925c60bda2dfd80da8;p=ardour.git

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 870fa2df5f..d02c5a88de 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -40,6 +40,7 @@ using namespace std;
 using namespace sigc;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
 PlaylistSelector::PlaylistSelector ()
 	: ArdourDialog ("playlist selector")
@@ -60,9 +61,8 @@ PlaylistSelector::PlaylistSelector ()
 	scroller.add (tree);
 	scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
 
-	// GTK2FIX do we need this stuff or is GTK applying some policy now?
-	//set_border_width (6);
-	// set_spacing (12);
+	get_vbox()->set_border_width (6);
+	get_vbox()->set_spacing (12);
 
 	get_vbox()->pack_start (scroller);
 
@@ -85,17 +85,28 @@ PlaylistSelector::clear_map ()
 	dspl_map.clear ();
 }
 
+bool
+PlaylistSelector::on_unmap_event (GdkEventAny* ev)
+{
+	cerr << "PLselector unmapped\n";
+	clear_map ();
+	if (model) {
+		model->clear ();
+	}
+	return Dialog::on_unmap_event (ev);
+}
+
 void
 PlaylistSelector::show_for (RouteUI* ruix)
 {
 	vector<const char*> item;
-	AudioDiskstream* 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);
 
@@ -111,11 +122,12 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	TreeModel::Row others = *(model->append ());
 
 	others[columns.text] = _("Other tracks");
-	others[columns.playlist] = 0;
+	boost::shared_ptr<Playlist> proxy = others[columns.playlist];
+	proxy.reset ();
 	
 	for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
 
-		AudioDiskstream* ds = session->diskstream_by_id (x->first);
+		boost::shared_ptr<Diskstream> ds = session->diskstream_by_id (x->first);
 
 		if (ds == 0) {
 			continue;
@@ -138,18 +150,20 @@ PlaylistSelector::show_for (RouteUI* ruix)
 		if (ds == this_ds) {
 			row = *(model->prepend());
 			row[columns.text] = nodename;
-			row[columns.playlist] = 0;
+			boost::shared_ptr<Playlist> proxy = row[columns.playlist];
+			proxy.reset ();
 		} else {
 			row = *(model->append (others.children()));
 			row[columns.text] = nodename;
-			row[columns.playlist] = 0;
+			boost::shared_ptr<Playlist> proxy = row[columns.playlist];
+			proxy.reset ();
 		}
 
 		/* Now insert all the playlists for this diskstream/track in a subtree */
 		
-		list<Playlist*> *pls = x->second;
+		list<boost::shared_ptr<Playlist> > *pls = x->second;
 		
-		for (list<Playlist*>::iterator p = pls->begin(); p != pls->end(); ++p) {
+		for (list<boost::shared_ptr<Playlist> >::iterator p = pls->begin(); p != pls->end(); ++p) {
 
 			TreeModel::Row child_row;
 
@@ -172,15 +186,15 @@ PlaylistSelector::show_for (RouteUI* ruix)
 }
 
 void
-PlaylistSelector::add_playlist_to_map (Playlist *pl)
+PlaylistSelector::add_playlist_to_map (boost::shared_ptr<Playlist> pl)
 {
-	AudioPlaylist* apl;
+	boost::shared_ptr<AudioPlaylist> apl;
 
 	if (pl->frozen()) {
 		return;
 	}
-
-	if ((apl = dynamic_cast<AudioPlaylist*> (pl)) == 0) {
+	
+	if ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) == 0) {
 		return;
 	}
 
@@ -188,7 +202,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<boost::shared_ptr<Playlist> >*> newp (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >);
 		
 		x = dspl_map.insert (dspl_map.end(), newp);
 	}
@@ -204,7 +218,7 @@ PlaylistSelector::set_session (Session* s)
 	session = s;
 
 	if (session) {
-		session->going_away.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
+		session->GoingAway.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
 	}
 }
 
@@ -218,11 +232,11 @@ PlaylistSelector::close_button_click ()
 void
 PlaylistSelector::selection_changed ()
 {
-	Playlist *playlist;
+	boost::shared_ptr<Playlist> playlist;
 
 	TreeModel::iterator iter = tree.get_selection()->get_selected();
 
-	if (!iter) {
+	if (!iter || rui == 0) {
 		/* nothing selected */
 		return;
 	}
@@ -230,19 +244,19 @@ PlaylistSelector::selection_changed ()
 	if ((playlist = ((*iter)[columns.playlist])) != 0) {
 		
 		AudioTrack* at;
-		AudioPlaylist* apl;
+		boost::shared_ptr<AudioPlaylist> apl;
 		
-		if ((at = dynamic_cast<AudioTrack*> (&rui->route())) == 0) {
+		if ((at = rui->audio_track()) == 0) {
 			/* eh? */
 			return;
 		}
 		
-		if ((apl = dynamic_cast<AudioPlaylist*> (playlist)) == 0) {
+		if ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (playlist)) == 0) {
 			/* eh? */
 			return;
 		}
 		
-		at->disk_stream().use_playlist (apl);
+		at->diskstream()->use_playlist (apl);
 
 		hide ();
 	}