diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 4 | ||||
| -rw-r--r-- | src/lib/player.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index b3f11c800..9cc7e5d25 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -557,7 +557,7 @@ Player::pass () return false; } - if (_playback_length == DCPTime()) { + if (_playback_length.load() == DCPTime()) { /* Special; just give one black frame */ emit_video (black_player_video_frame(Eyes::BOTH), DCPTime()); return true; @@ -695,7 +695,7 @@ Player::pass () } } - auto pull_to = _playback_length; + auto pull_to = _playback_length.load(); for (auto const& i: alive_stream_states) { if (!i.second.piece->done && i.second.last_push_end < pull_to) { pull_to = i.second.last_push_end; diff --git a/src/lib/player.h b/src/lib/player.h index e07cc8200..388a160c7 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -225,7 +225,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; |