X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=e0c51082a1eeadaa5a19a1859e6893d2f3edec54;hb=5ef06dd439088226683beff5c6fc1d5af55a014b;hp=ca40951e8be027e4843c9715cd8dafab66fc50a0;hpb=09ec34292683c8a4edcc0060b938192ae18225c4;p=ardour.git

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index ca40951e8b..e0c51082a1 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -36,14 +36,13 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
 
 PlaylistSelector::PlaylistSelector ()
-	: ArdourDialog ("playlist selector")
+	: ArdourDialog (_("Playlists"))
 {
 	rui = 0;
 
@@ -53,8 +52,6 @@ PlaylistSelector::PlaylistSelector ()
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
 	set_size_request (300, 200);
 
-	set_title (_("Playlists"));
-
 	model = TreeStore::create (columns);
 	tree.set_model (model);
 	tree.append_column (_("Playlists grouped by track"), columns.text);
@@ -68,7 +65,7 @@ PlaylistSelector::PlaylistSelector ()
 	get_vbox()->pack_start (scroller);
 
 	Button* b = add_button (_("close"), RESPONSE_CANCEL);
-	b->signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
+	b->signal_clicked().connect (sigc::mem_fun(*this, &PlaylistSelector::close_button_click));
 
 }
 
@@ -80,10 +77,10 @@ PlaylistSelector::~PlaylistSelector ()
 void
 PlaylistSelector::clear_map ()
 {
-	for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
+	for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) {
 		delete x->second;
 	}
-	dspl_map.clear ();
+	trpl_map.clear ();
 }
 
 bool
@@ -100,7 +97,6 @@ void
 PlaylistSelector::show_for (RouteUI* ruix)
 {
 	vector<const char*> item;
-	boost::shared_ptr<Diskstream> this_ds;
 	string str;
 
 	rui = ruix;
@@ -112,9 +108,9 @@ PlaylistSelector::show_for (RouteUI* ruix)
 
 	model->clear ();
 
-	session->foreach_playlist (this, &PlaylistSelector::add_playlist_to_map);
+	_session->playlists->foreach (this, &PlaylistSelector::add_playlist_to_map);
 
-	this_ds = rui->get_diskstream();
+	boost::shared_ptr<Track> this_track = rui->track();
 
 	TreeModel::Row others = *(model->append ());
 
@@ -122,29 +118,29 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	boost::shared_ptr<Playlist> proxy = others[columns.playlist];
 	proxy.reset ();
 
-	for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
+	for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) {
 
-		boost::shared_ptr<Diskstream> ds = session->diskstream_by_id (x->first);
+		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (_session->route_by_id (x->first));
 
-		if (ds == 0) {
+		if (tr == 0) {
 			continue;
 		}
 
-		/* add a node for the diskstream */
+		/* add a node for the track */
 
 		string nodename;
 
-		if (ds->name().empty()) {
+		if (tr->name().empty()) {
 			nodename = _("unassigned");
 		} else {
-			nodename = ds->name().c_str();
+			nodename = tr->name().c_str();
 		}
 
 		TreeModel::Row row;
 		TreeModel::Row* selected_row = 0;
 		TreePath this_path;
 
-		if (ds == this_ds) {
+		if (tr == this_track) {
 			row = *(model->prepend());
 			row[columns.text] = nodename;
 			boost::shared_ptr<Playlist> proxy = row[columns.playlist];
@@ -158,7 +154,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 
 		/* Now insert all the playlists for this diskstream/track in a subtree */
 
-		list<boost::shared_ptr<Playlist> > *pls = x->second;
+		list<boost::shared_ptr<Playlist> >* pls = x->second;
 
 		for (list<boost::shared_ptr<Playlist> >::iterator p = pls->begin(); p != pls->end(); ++p) {
 
@@ -168,7 +164,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 			child_row[columns.text] = (*p)->name();
 			child_row[columns.playlist] = *p;
 
-			if (*p == this_ds->playlist()) {
+			if (*p == this_track->playlist()) {
 				selected_row = &child_row;
 			}
 		}
@@ -180,7 +176,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 
 	// Add unassigned (imported) playlists to the list
 	list<boost::shared_ptr<Playlist> > unassigned;
-	session->unassigned_playlists (unassigned);
+	_session->playlists->unassigned (unassigned);
 
 	TreeModel::Row row;
 	TreeModel::Row* selected_row = 0;
@@ -198,7 +194,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 		child_row[columns.text] = (*p)->name();
 		child_row[columns.playlist] = *p;
 
-		if (*p == this_ds->playlist()) {
+		if (*p == this_track->playlist()) {
 			selected_row = &child_row;
 		}
 
@@ -208,7 +204,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	}
 
 	show_all ();
-	select_connection = tree.get_selection()->signal_changed().connect (mem_fun(*this, &PlaylistSelector::selection_changed));
+	select_connection = tree.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PlaylistSelector::selection_changed));
 }
 
 void
@@ -224,30 +220,15 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr<Playlist> pl)
 		return;
 	}
 
-	DSPL_Map::iterator x;
-
-	if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
-
-		pair<PBD::ID,list<boost::shared_ptr<Playlist> >*> newp (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >);
+	TrackPlaylistMap::iterator x;
 
-		x = dspl_map.insert (dspl_map.end(), newp);
+	if ((x = trpl_map.find (apl->get_orig_diskstream_id())) == trpl_map.end()) {
+		x = trpl_map.insert (trpl_map.end(), make_pair (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >));
 	}
 
 	x->second->push_back (pl);
 }
 
-void
-PlaylistSelector::set_session (Session* s)
-{
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlaylistSelector::set_session), s));
-
-	session = s;
-
-	if (session) {
-		session->GoingAway.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
-	}
-}
-
 void
 PlaylistSelector::close_button_click ()
 {
@@ -282,7 +263,7 @@ PlaylistSelector::selection_changed ()
 			return;
 		}
 
-		at->diskstream()->use_playlist (apl);
+		at->use_playlist (apl);
 
 		hide ();
 	}