diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-10 19:20:15 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-10 19:20:15 +0000 |
commit | d23a6de077181caa24af52229bb040c87ed34ebd (patch) | |
tree | 664ec7adbdf87826aced9b8d02d6b2603bf5d61d /libs/ardour/session_playlists.cc | |
parent | 6e211e27e2027da328b6fe117f10e1962c007afb (diff) |
fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_playlists.cc')
-rw-r--r-- | libs/ardour/session_playlists.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc index 1e31801271..8e25cbfd9d 100644 --- a/libs/ardour/session_playlists.cc +++ b/libs/ardour/session_playlists.cc @@ -207,13 +207,13 @@ SessionPlaylists::unassigned (std::list<boost::shared_ptr<Playlist> > & list) Glib::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { - if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) { + if (!(*i)->get_orig_track_id().to_s().compare ("0")) { list.push_back (*i); } } for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { - if (!(*i)->get_orig_diskstream_id().to_s().compare ("0")) { + if (!(*i)->get_orig_track_id().to_s().compare ("0")) { list.push_back (*i); } } @@ -462,7 +462,7 @@ SessionPlaylists::playlists_for_track (boost::shared_ptr<Track> tr) const vector<boost::shared_ptr<Playlist> > pl_tr; for (vector<boost::shared_ptr<Playlist> >::iterator i = pl.begin(); i != pl.end(); ++i) { - if (((*i)->get_orig_diskstream_id() == tr->diskstream_id()) || (tr->playlist()->id() == (*i)->id())) { + if (((*i)->get_orig_track_id() == tr->id()) || (tr->playlist()->id() == (*i)->id())) { pl_tr.push_back (*i); } } |