X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=e58b69a818e22bb651be2221eb634c68ecd36446;hb=c724f3f82c53b0ec426bec322358ed2eccc52d58;hp=cda844ee898e28029256b19a5549dffa2de00ec7;hpb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;p=ardour.git

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index cda844ee89..e58b69a818 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -31,7 +31,7 @@
 #include "route_ui.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -44,7 +44,6 @@ PlaylistSelector::PlaylistSelector ()
 {
 	rui = 0;
 
-	set_position (WIN_POS_MOUSE);
 	set_name ("PlaylistSelectorWindow");
 	set_modal(true);
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
@@ -62,7 +61,7 @@ PlaylistSelector::PlaylistSelector ()
 
 	get_vbox()->pack_start (scroller);
 
-	Button* b = add_button (_("close"), RESPONSE_CANCEL);
+	Button* b = add_button (_("Close"), RESPONSE_CANCEL);
 	b->signal_clicked().connect (sigc::mem_fun(*this, &PlaylistSelector::close_button_click));
 
 }
@@ -119,24 +118,12 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) {
 
 		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (_session->route_by_id (x->first));
-		
-		/* legacy sessions stored the diskstream ID as the original
-		 * playlist owner. so try there instead.
-		 */
-
-		if (tr == 0) {
-			tr = _session->track_by_diskstream_id (x->first);
-		}
-
-		if (tr == 0) {
-			continue;
-		}
 
 		/* add a node for the track */
 
 		string nodename;
 
-		if (tr->name().empty()) {
+		if (!tr || tr->name().empty()) {
 			nodename = _("unassigned");
 		} else {
 			nodename = tr->name().c_str();
@@ -273,7 +260,7 @@ PlaylistSelector::selection_changed ()
 			return;
 		}
 
-		at->use_playlist (apl);
+		at->use_playlist (DataType::AUDIO, apl);
 
 		hide ();
 	}