X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=22701cb2ca452c486746f643063c7bb7affa1250;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=e07cc8200a3bb9af2d15b51856511e1902f311c4;hpb=c8bd4ead4c9e757d88136a7fdd556272f36be793;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index e07cc8200..22701cb2c 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -155,7 +155,7 @@ private:
 	void emit_audio (std::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
 	std::shared_ptr<const Playlist> playlist () const;
 
-	/** Mutex to protect the whole Player state.  When it's used for the preview we have
+	/** Mutex to protect the most of the Player state.  When it's used for the preview we have
 	    seek() and pass() called from the Butler thread and lots of other stuff called
 	    from the GUI thread.
 	*/
@@ -173,6 +173,8 @@ private:
 	 *  the size of preview in a window.
 	 */
 	boost::atomic<dcp::Size> _video_container_size;
+
+	mutable boost::mutex _black_image_mutex;
 	std::shared_ptr<Image> _black_image;
 
 	/** true if the player should ignore all video; i.e. never produce any */
@@ -225,7 +227,7 @@ private:
 	ActiveText _active_texts[static_cast<int>(TextType::COUNT)];
 	std::shared_ptr<AudioProcessor> _audio_processor;
 
-	dcpomatic::DCPTime _playback_length;
+	boost::atomic<dcpomatic::DCPTime> _playback_length;
 
 	/** Alignment for subtitle images that we create */
 	Image::Alignment const _subtitle_alignment = Image::Alignment::PADDED;