X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer.cc;h=6361d7b2acc1f3d0d6fb523d15d72107f9449a9f;hb=de522946acfd022b5084434fbcfd225499a17293;hp=eb92bbab1a390ac6defc17f3c16654ad0b6fd292;hpb=c2febf6895f80b2d75cceb01bf0f9b0970c1b7d5;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index eb92bbab1..6361d7b2a 100644
--- 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)
+	, _fast(false)
 	, _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)
+	, _fast(false)
 	, _tolerant (film->tolerant())
 	, _audio_merger (_film->audio_frame_rate())
 {
@@ -539,9 +541,8 @@ Player::set_always_burn_open_subtitles ()
 void
 Player::set_fast ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	_fast = true;
-	setup_pieces_unlocked ();
+	setup_pieces();
 }