X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=c2911bf1087e19dae86257c37c14ce9c1a864b21;hb=a2ceaa313a2b8ba28516c935f7f8b82d69957b77;hp=e99c345bb211ea99d683fcb5b3d32513305ad4c9;hpb=7c73ec405fdb55bd78d82d764999b5af6d81e973;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index e99c345bb..c2911bf10 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -35,6 +35,7 @@ #include "empty.h" #include #include +#include #include namespace dcp { @@ -149,8 +150,8 @@ private: boost::shared_ptr _film; boost::shared_ptr _playlist; - /** true if we are suspended (i.e. pass() and seek() do nothing) */ - bool _suspended; + /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ + boost::atomic _suspended; std::list > _pieces; /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ @@ -206,6 +207,9 @@ private: ActiveText _active_texts[TEXT_COUNT]; boost::shared_ptr _audio_processor; + /* Cached stuff */ + boost::optional _film_length; + boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_change_connection; boost::signals2::scoped_connection _playlist_content_change_connection;