projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0e05f7
)
cont'd 20262abe (keep all playlists)
author
Robin Gareus
<robin@gareus.org>
Sat, 21 Nov 2015 21:45:26 +0000
(22:45 +0100)
committer
Robin Gareus
<robin@gareus.org>
Sat, 21 Nov 2015 21:45:26 +0000
(22:45 +0100)
libs/ardour/session_playlists.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/session_playlists.cc
b/libs/ardour/session_playlists.cc
index cc2f1b25abf06927a74856f763bd2c59b514dc42..649d42902bfa4f846a840c9c8c7ba17913ce858e 100644
(file)
--- a/
libs/ardour/session_playlists.cc
+++ b/
libs/ardour/session_playlists.cc
@@
-333,10
+333,16
@@
SessionPlaylists::maybe_delete_unused (boost::function<int(boost::shared_ptr<Pla
{
vector<boost::shared_ptr<Playlist> > playlists_tbd;
{
vector<boost::shared_ptr<Playlist> > playlists_tbd;
- bool delete_all = false;
+ bool delete_remaining = false;
+ bool keep_remaining = false;
for (List::iterator x = unused_playlists.begin(); x != unused_playlists.end(); ++x) {
for (List::iterator x = unused_playlists.begin(); x != unused_playlists.end(); ++x) {
- if (delete_all) {
+
+ if (keep_remaining) {
+ break;
+ }
+
+ if (delete_remaining) {
playlists_tbd.push_back (*x);
continue;
}
playlists_tbd.push_back (*x);
continue;
}
@@
-348,9
+354,14
@@
SessionPlaylists::maybe_delete_unused (boost::function<int(boost::shared_ptr<Pla
// abort
return true;
// abort
return true;
+ case -2:
+ // keep this and all later
+ keep_remaining = true;
+ break;
+
case 2:
// delete this and all later
case 2:
// delete this and all later
- delete_
all
= true;
+ delete_
remaining
= true;
// no break;
case 1:
// no break;
case 1: