projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use atomic for _fast.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index eb92bbab1a390ac6defc17f3c16654ad0b6fd292..6361d7b2acc1f3d0d6fb523d15d72107f9449a9f 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-103,6
+103,7
@@
Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment
, _ignore_audio(false)
, _ignore_text(false)
, _always_burn_open_subtitles(false)
, _ignore_audio(false)
, _ignore_text(false)
, _always_burn_open_subtitles(false)
+ , _fast(false)
, _tolerant (film->tolerant())
, _audio_merger (_film->audio_frame_rate())
, _subtitle_alignment (subtitle_alignment)
, _tolerant (film->tolerant())
, _audio_merger (_film->audio_frame_rate())
, _subtitle_alignment (subtitle_alignment)
@@
-119,6
+120,7
@@
Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
, _ignore_audio(false)
, _ignore_text(false)
, _always_burn_open_subtitles(false)
, _ignore_audio(false)
, _ignore_text(false)
, _always_burn_open_subtitles(false)
+ , _fast(false)
, _tolerant (film->tolerant())
, _audio_merger (_film->audio_frame_rate())
{
, _tolerant (film->tolerant())
, _audio_merger (_film->audio_frame_rate())
{
@@
-539,9
+541,8
@@
Player::set_always_burn_open_subtitles ()
void
Player::set_fast ()
{
void
Player::set_fast ()
{
- boost::mutex::scoped_lock lm (_mutex);
_fast = true;
_fast = true;
- setup_pieces
_unlocked
();
+ setup_pieces();
}
}