projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use atomic shared_ptr stuff for _black_frame.
[dcpomatic.git]
/
src
/
lib
/
player.h
diff --git
a/src/lib/player.h
b/src/lib/player.h
index e07cc8200a3bb9af2d15b51856511e1902f311c4..5abd59de26a8c8fbda3940bde6d05a67077fbab1 100644
(file)
--- a/
src/lib/player.h
+++ b/
src/lib/player.h
@@
-173,6
+173,7
@@
private:
* the size of preview in a window.
*/
boost::atomic<dcp::Size> _video_container_size;
* the size of preview in a window.
*/
boost::atomic<dcp::Size> _video_container_size;
+ /** Should be accessed using the std::atomic... methods */
std::shared_ptr<Image> _black_image;
/** true if the player should ignore all video; i.e. never produce any */
std::shared_ptr<Image> _black_image;
/** true if the player should ignore all video; i.e. never produce any */
@@
-225,7
+226,7
@@
private:
ActiveText _active_texts[static_cast<int>(TextType::COUNT)];
std::shared_ptr<AudioProcessor> _audio_processor;
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;
/** Alignment for subtitle images that we create */
Image::Alignment const _subtitle_alignment = Image::Alignment::PADDED;