projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip silent sources on session-archive -- fixes #7699
[ardour.git]
/
gtk2_ardour
/
playlist_selector.cc
diff --git
a/gtk2_ardour/playlist_selector.cc
b/gtk2_ardour/playlist_selector.cc
index b0bc515a61ecabbeb350174b7475cd36242e1dfd..e58b69a818e22bb651be2221eb634c68ecd36446 100644
(file)
--- 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 "route_ui.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace Gtk;
using namespace std;
using namespace Gtk;
@@
-44,7
+44,6
@@
PlaylistSelector::PlaylistSelector ()
{
rui = 0;
{
rui = 0;
- set_position (WIN_POS_MOUSE);
set_name ("PlaylistSelectorWindow");
set_modal(true);
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
set_name ("PlaylistSelectorWindow");
set_modal(true);
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
@@
-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));
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;
/* 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();
nodename = _("unassigned");
} else {
nodename = tr->name().c_str();
@@
-273,7
+260,7
@@
PlaylistSelector::selection_changed ()
return;
}
return;
}
- at->use_playlist (apl);
+ at->use_playlist (
DataType::AUDIO,
apl);
hide ();
}
hide ();
}