From cc6c991ddd53e2f151140cbadef2da660cd7d6a3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 5 Jun 2020 01:18:46 +0200 Subject: 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. --- src/lib/wscript | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/lib/wscript') diff --git a/src/lib/wscript b/src/lib/wscript index fb222fcf4..ad4dbd87d 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2020 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -26,7 +26,6 @@ sources = """ analyse_subtitles_job.cc analytics.cc atmos_mxf_content.cc - atomicity_checker.cc audio_analysis.cc audio_buffers.cc audio_content.cc -- cgit v1.2.3