diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-05 01:18:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-05 01:18:46 +0200 |
| commit | cc6c991ddd53e2f151140cbadef2da660cd7d6a3 (patch) | |
| tree | 77ee564480ed8e9236dd136d232166d042be6be9 /src/lib/playlist.h | |
| parent | bb8cb41bb0e30c704ab034918113af1430f072a1 (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.h')
| -rw-r--r-- | src/lib/playlist.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/playlist.h b/src/lib/playlist.h index dc984aacf..51c13e33f 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -23,10 +23,10 @@ #include "util.h" #include "frame_rate_change.h" -#include "atomicity_checker.h" #include <libcxml/cxml.h> #include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> +#include <boost/thread.hpp> #include <list> class Film; @@ -94,7 +94,6 @@ private: bool _sequence; bool _sequencing; std::list<boost::signals2::connection> _content_connections; - AtomicityChecker _checker; }; #endif |