X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=2793bd62a9e70583b5961f08506fa05f08e2d017;hb=1c09ae94a4b94395ce2c13020a71526a65b9ce7e;hp=05e47b149d1a463847801d5376c48a657c8b1930;hpb=d41c3bb9ebfb450316e6c79fdf0281ac2e155aa1;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 05e47b149..2793bd62a 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -102,7 +102,10 @@ Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment
 	, _ignore_video(false)
 	, _ignore_audio(false)
 	, _ignore_text(false)
+	, _always_burn_open_subtitles(false)
+	, _fast(false)
 	, _tolerant (film->tolerant())
+	, _play_referenced(false)
 	, _audio_merger (_film->audio_frame_rate())
 	, _subtitle_alignment (subtitle_alignment)
 {
@@ -117,7 +120,10 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 	, _ignore_video(false)
 	, _ignore_audio(false)
 	, _ignore_text(false)
+	, _always_burn_open_subtitles(false)
+	, _fast(false)
 	, _tolerant (film->tolerant())
+	, _play_referenced(false)
 	, _audio_merger (_film->audio_frame_rate())
 {
 	construct ();
@@ -142,14 +148,6 @@ Player::construct ()
 }
 
 
-void
-Player::setup_pieces ()
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	setup_pieces_unlocked ();
-}
-
-
 bool
 have_video (shared_ptr<const Content> content)
 {
@@ -165,8 +163,10 @@ have_audio (shared_ptr<const Content> content)
 
 
 void
-Player::setup_pieces_unlocked ()
+Player::setup_pieces ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+
 	_playback_length = _playlist ? _playlist->length(_film) : _film->length();
 
 	auto old_pieces = _pieces;
@@ -339,17 +339,15 @@ Player::set_video_container_size (dcp::Size s)
 {
 	Change (ChangeType::PENDING, PlayerProperty::VIDEO_CONTAINER_SIZE, false);
 
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-
-		if (s == _video_container_size) {
-			lm.unlock ();
-			Change (ChangeType::CANCELLED, PlayerProperty::VIDEO_CONTAINER_SIZE, false);
-			return;
-		}
+	if (s == _video_container_size) {
+		Change(ChangeType::CANCELLED, PlayerProperty::VIDEO_CONTAINER_SIZE, false);
+		return;
+	}
 
-		_video_container_size = s;
+	_video_container_size = s;
 
+	{
+		boost::mutex::scoped_lock lm (_mutex);
 		_black_image = make_shared<Image>(AV_PIX_FMT_RGB24, _video_container_size, Image::Alignment::PADDED);
 		_black_image->make_black ();
 	}
@@ -529,7 +527,6 @@ Player::set_ignore_text ()
 void
 Player::set_always_burn_open_subtitles ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	_always_burn_open_subtitles = true;
 }
 
@@ -538,18 +535,16 @@ Player::set_always_burn_open_subtitles ()
 void
 Player::set_fast ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	_fast = true;
-	setup_pieces_unlocked ();
+	setup_pieces();
 }
 
 
 void
 Player::set_play_referenced ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
 	_play_referenced = true;
-	setup_pieces_unlocked ();
+	setup_pieces();
 }
 
 
@@ -867,14 +862,14 @@ Player::open_subtitles_for_frame (DCPTime time) const
 			}
 
 			/* i.image will already have been scaled to fit _video_container_size */
-			dcp::Size scaled_size (i.rectangle.width * _video_container_size.width, i.rectangle.height * _video_container_size.height);
+			dcp::Size scaled_size (i.rectangle.width * _video_container_size.load().width, i.rectangle.height * _video_container_size.load().height);
 
 			captions.push_back (
 				PositionImage (
 					i.image,
 					Position<int> (
-						lrint(_video_container_size.width * i.rectangle.x),
-						lrint(_video_container_size.height * i.rectangle.y)
+						lrint(_video_container_size.load().width * i.rectangle.x),
+						lrint(_video_container_size.load().height * i.rectangle.y)
 						)
 					)
 				);
@@ -1137,8 +1132,8 @@ Player::bitmap_text_start (weak_ptr<Piece> weak_piece, weak_ptr<const TextConten
 		auto image = sub.image;
 
 		/* We will scale the subtitle up to fit _video_container_size */
-		int const width = sub.rectangle.width * _video_container_size.width;
-		int const height = sub.rectangle.height * _video_container_size.height;
+		int const width = sub.rectangle.width * _video_container_size.load().width;
+		int const height = sub.rectangle.height * _video_container_size.load().height;
 		if (width == 0 || height == 0) {
 			return;
 		}
@@ -1413,25 +1408,20 @@ Player::set_dcp_decode_reduction (optional<int> reduction)
 {
 	Change (ChangeType::PENDING, PlayerProperty::DCP_DECODE_REDUCTION, false);
 
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-
-		if (reduction == _dcp_decode_reduction) {
-			lm.unlock ();
-			Change (ChangeType::CANCELLED, PlayerProperty::DCP_DECODE_REDUCTION, false);
-			return;
-		}
-
-		_dcp_decode_reduction = reduction;
-		setup_pieces_unlocked ();
+	if (reduction == _dcp_decode_reduction.load()) {
+		Change(ChangeType::CANCELLED, PlayerProperty::DCP_DECODE_REDUCTION, false);
+		return;
 	}
 
+	_dcp_decode_reduction = reduction;
+	setup_pieces();
+
 	Change (ChangeType::DONE, PlayerProperty::DCP_DECODE_REDUCTION, false);
 }
 
 
 optional<DCPTime>
-Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
+Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
@@ -1447,7 +1437,7 @@ Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
 
 
 optional<ContentTime>
-Player::dcp_to_content_time (shared_ptr<const Content> content, DCPTime t)
+Player::dcp_to_content_time (shared_ptr<const Content> content, DCPTime t) const
 {
 	boost::mutex::scoped_lock lm (_mutex);