diff options
author | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
commit | 828cd6fd0b8838edb39e6b3f62397a5fe369e1d5 (patch) | |
tree | 62bfa8fdaaf846a5a4c18e6607ef8f1e8f13c8a2 /src/queue/PlaylistEdit.cxx | |
parent | 681643ea9e6e196c449f1974cd50e1f400da3450 (diff) | |
parent | ecb67a1ed16e93f5fe552b28631e517060115648 (diff) | |
download | mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.gz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.xz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.zip |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/queue/PlaylistEdit.cxx')
-rw-r--r-- | src/queue/PlaylistEdit.cxx | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/queue/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx index e8f1a178f..92865cab7 100644 --- a/src/queue/PlaylistEdit.cxx +++ b/src/queue/PlaylistEdit.cxx @@ -38,6 +38,12 @@ void playlist::OnModified() { + if (bulk_edit) { + /* postponed to CommitBulk() */ + bulk_modified = true; + return; + } + queue.IncrementVersion(); idle_add(IDLE_PLAYLIST); @@ -54,6 +60,35 @@ playlist::Clear(PlayerControl &pc) OnModified(); } +void +playlist::BeginBulk() +{ + assert(!bulk_edit); + + bulk_edit = true; + bulk_modified = false; +} + +void +playlist::CommitBulk(PlayerControl &pc) +{ + assert(bulk_edit); + + bulk_edit = false; + if (!bulk_modified) + return; + + if (queued < 0) + /* if no song was queued, UpdateQueuedSong() is being + ignored in "bulk" edit mode; now that we have + shuffled all new songs, we can pick a random one + (instead of always picking the first one that was + added) */ + UpdateQueuedSong(pc, nullptr); + + OnModified(); +} + unsigned playlist::AppendSong(PlayerControl &pc, DetachedSong &&song, Error &error) { |