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/Playlist.hxx | |
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/Playlist.hxx')
-rw-r--r-- | src/queue/Playlist.hxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/queue/Playlist.hxx b/src/queue/Playlist.hxx index 4a4c7f30c..f2d778382 100644 --- a/src/queue/Playlist.hxx +++ b/src/queue/Playlist.hxx @@ -50,6 +50,18 @@ struct playlist { bool stop_on_error; /** + * If true, then a bulk edit has been initiated by + * BeginBulk(), and UpdateQueuedSong() and OnModified() will + * be postponed until CommitBulk() + */ + bool bulk_edit; + + /** + * Has the queue been modified during bulk edit mode? + */ + bool bulk_modified; + + /** * Number of errors since playback was started. If this * number exceeds the length of the playlist, MPD gives up, * because all songs have been tried. @@ -73,7 +85,9 @@ struct playlist { int queued; playlist(unsigned max_length) - :queue(max_length), playing(false), current(-1), queued(-1) { + :queue(max_length), playing(false), + bulk_edit(false), + current(-1), queued(-1) { } ~playlist() { @@ -130,6 +144,9 @@ protected: void UpdateQueuedSong(PlayerControl &pc, const DetachedSong *prev); public: + void BeginBulk(); + void CommitBulk(PlayerControl &pc); + void Clear(PlayerControl &pc); /** |