summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-06-05 01:18:46 +0200
committerCarl Hetherington <cth@carlh.net>2020-06-05 01:18:46 +0200
commitcc6c991ddd53e2f151140cbadef2da660cd7d6a3 (patch)
tree77ee564480ed8e9236dd136d232166d042be6be9 /src/lib/playlist.cc
parentbb8cb41bb0e30c704ab034918113af1430f072a1 (diff)
This AtomicityChecker was introduced a long time ago for reasons
that are unclear. This commit removes it because it was causing a bug whereby the _suspended count on Butler would not go back down to 0 due to signals being blocked by the AtomicityChecker. I can see two possibilities: 1. AtomicityChecker is a band-aid for some deeper problem, in which case other bugs will become apparent. Perhaps it relates to signals being sent before the butler/player/playlist are connected to content. 2. AtomicityChecker was correct but was not identifiying signals from different pieces of content correctly; so the correct fix would be to add the content pointer to the _checker.send() call and block based also on that.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 48053bbf4..b96b0fbe0 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -70,13 +70,6 @@ Playlist::~Playlist ()
void
Playlist::content_change (weak_ptr<const Film> weak_film, ChangeType type, weak_ptr<Content> content, int property, bool frequent)
{
- /* Make sure we only hear about atomic changes (e.g. a PENDING always with the DONE/CANCELLED)
- Ignore any DONE/CANCELLED that arrives without a PENDING.
- */
- if (_checker.send (type, property)) {
- return;
- }
-
shared_ptr<const Film> film = weak_film.lock ();
DCPOMATIC_ASSERT (film);