X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=cdc144d1b7c7cde680a5acef4ad778da5d4c77ca;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=e0c51082a1eeadaa5a19a1859e6893d2f3edec54;hpb=1b9bf21aa40eee32eb4c7ab49d1ad8ab51d09b11;p=ardour.git

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index e0c51082a1..cdc144d1b7 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -20,12 +20,10 @@
 
 #include <gtkmm/button.h>
 
-#include "ardour/session_playlist.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/playlist.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioplaylist.h"
-#include "ardour/configuration.h"
+#include "ardour/playlist.h"
+#include "ardour/session_playlist.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 
@@ -46,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);
@@ -64,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));
 
 }
@@ -121,6 +118,14 @@ 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;
@@ -137,7 +142,8 @@ PlaylistSelector::show_for (RouteUI* ruix)
 		}
 
 		TreeModel::Row row;
-		TreeModel::Row* selected_row = 0;
+		TreeModel::Row selected_row;
+		bool have_selected = false;
 		TreePath this_path;
 
 		if (tr == this_track) {
@@ -165,12 +171,13 @@ PlaylistSelector::show_for (RouteUI* ruix)
 			child_row[columns.playlist] = *p;
 
 			if (*p == this_track->playlist()) {
-				selected_row = &child_row;
+				selected_row = child_row;
+				have_selected = true;
 			}
 		}
 
-		if (selected_row != 0) {
-			tree.get_selection()->select (*selected_row);
+		if (have_selected) {
+			tree.get_selection()->select (selected_row);
 		}
 	}
 
@@ -179,7 +186,8 @@ PlaylistSelector::show_for (RouteUI* ruix)
 	_session->playlists->unassigned (unassigned);
 
 	TreeModel::Row row;
-	TreeModel::Row* selected_row = 0;
+	TreeModel::Row selected_row;
+	bool have_selected = false;
 	TreePath this_path;
 
 	row = *(model->append (others.children()));
@@ -195,11 +203,12 @@ PlaylistSelector::show_for (RouteUI* ruix)
 		child_row[columns.playlist] = *p;
 
 		if (*p == this_track->playlist()) {
-			selected_row = &child_row;
+			selected_row = child_row;
+			have_selected = true;
 		}
 
-		if (selected_row != 0) {
-			tree.get_selection()->select (*selected_row);
+		if (have_selected) {
+			tree.get_selection()->select (selected_row);
 		}
 	}
 
@@ -222,8 +231,8 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr<Playlist> pl)
 
 	TrackPlaylistMap::iterator x;
 
-	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> >));
+	if ((x = trpl_map.find (apl->get_orig_track_id())) == trpl_map.end()) {
+		x = trpl_map.insert (trpl_map.end(), make_pair (apl->get_orig_track_id(), new list<boost::shared_ptr<Playlist> >));
 	}
 
 	x->second->push_back (pl);