X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=22701cb2ca452c486746f643063c7bb7affa1250;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=388a160c79727e10069ed9cc8039373177ed4d08;hpb=78b87aaa0fc6ac7ba2b79409a38e472bd50d24a9;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 388a160c7..22701cb2c 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -155,7 +155,7 @@ private: void emit_audio (std::shared_ptr data, dcpomatic::DCPTime time); std::shared_ptr 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 _video_container_size; + + mutable boost::mutex _black_image_mutex; std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */