#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>
#include "route_ui.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Gtk;
using namespace PBD;
PlaylistSelector::PlaylistSelector ()
- : ArdourDialog ("playlist selector")
+ : ArdourDialog (_("Playlists"))
{
rui = 0;
- set_position (WIN_POS_MOUSE);
set_name ("PlaylistSelectorWindow");
set_modal(true);
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);
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));
}
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;
}
}
TreeModel::Row row;
- TreeModel::Row* selected_row = 0;
+ TreeModel::Row selected_row;
+ bool have_selected = false;
TreePath this_path;
if (tr == this_track) {
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);
}
}
_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()));
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);
}
}
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);