X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=732493f3b065d1c51bbbe339f315552229fd65e5;hb=d3ecb8495a42d039b07313e393734c49fdc6be66;hp=e9ca38c81d551c3ca9caee170f0d6f20932f1cca;hpb=053bf81d7ef24843cc2eea62e24c2296fed48950;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index e9ca38c81..732493f3b 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -140,18 +140,102 @@ Player::construct ()
 	auto film = _film.lock();
 	DCPOMATIC_ASSERT(film);
 
+	connect();
+	set_video_container_size(film->frame_size());
+
+	film_change (ChangeType::DONE, Film::Property::AUDIO_PROCESSOR);
+
+	setup_pieces ();
+	seek (DCPTime (), true);
+}
+
+
+void
+Player::connect()
+{
+	auto film = _film.lock();
+	DCPOMATIC_ASSERT(film);
+
 	_film_changed_connection = film->Change.connect(bind(&Player::film_change, this, _1, _2));
 	/* The butler must hear about this first, so since we are proxying this through to the butler we must
 	   be first.
 	*/
 	_playlist_change_connection = playlist()->Change.connect (bind (&Player::playlist_change, this, _1), boost::signals2::at_front);
 	_playlist_content_change_connection = playlist()->ContentChange.connect (bind(&Player::playlist_content_change, this, _1, _3, _4));
-	set_video_container_size(film->frame_size());
+}
 
-	film_change (ChangeType::DONE, Film::Property::AUDIO_PROCESSOR);
 
-	setup_pieces ();
-	seek (DCPTime (), true);
+Player::Player(Player&& other)
+	: _film(other._film)
+	, _playlist(std::move(other._playlist))
+	, _suspended(other._suspended.load())
+	, _pieces(std::move(other._pieces))
+	, _video_container_size(other._video_container_size.load())
+	, _black_image(std::move(other._black_image))
+	, _ignore_video(other._ignore_video.load())
+	, _ignore_audio(other._ignore_audio.load())
+	, _ignore_text(other._ignore_text.load())
+	, _always_burn_open_subtitles(other._always_burn_open_subtitles.load())
+	, _fast(other._fast.load())
+	, _tolerant(other._tolerant)
+	, _play_referenced(other._play_referenced.load())
+	, _next_video_time(other._next_video_time)
+	, _next_audio_time(other._next_audio_time)
+	, _dcp_decode_reduction(other._dcp_decode_reduction.load())
+	, _last_video(std::move(other._last_video))
+	, _audio_merger(std::move(other._audio_merger))
+	, _shuffler(std::move(other._shuffler))
+	, _delay(std::move(other._delay))
+	, _stream_states(std::move(other._stream_states))
+	, _black(std::move(other._black))
+	, _silent(std::move(other._silent))
+	, _active_texts(std::move(other._active_texts))
+	, _audio_processor(std::move(other._audio_processor))
+	, _playback_length(other._playback_length.load())
+	, _subtitle_alignment(other._subtitle_alignment)
+{
+	connect();
+}
+
+
+Player&
+Player::operator=(Player&& other)
+{
+	if (this == &other) {
+		return *this;
+	}
+
+	_film = std::move(other._film);
+	_playlist = std::move(other._playlist);
+	_suspended = other._suspended.load();
+	_pieces = std::move(other._pieces);
+	_video_container_size = other._video_container_size.load();
+	_black_image = std::move(other._black_image);
+	_ignore_video = other._ignore_video.load();
+	_ignore_audio = other._ignore_audio.load();
+	_ignore_text = other._ignore_text.load();
+	_always_burn_open_subtitles = other._always_burn_open_subtitles.load();
+	_fast = other._fast.load();
+	_tolerant = other._tolerant;
+	_play_referenced = other._play_referenced.load();
+	_next_video_time = other._next_video_time;
+	_next_audio_time = other._next_audio_time;
+	_dcp_decode_reduction = other._dcp_decode_reduction.load();
+	_last_video = std::move(other._last_video);
+	_audio_merger = std::move(other._audio_merger);
+	_shuffler = std::move(other._shuffler);
+	_delay = std::move(other._delay);
+	_stream_states = std::move(other._stream_states);
+	_black = std::move(other._black);
+	_silent = std::move(other._silent);
+	_active_texts = std::move(other._active_texts);
+	_audio_processor = std::move(other._audio_processor);
+	_playback_length = other._playback_length.load();
+	_subtitle_alignment = other._subtitle_alignment;
+
+	connect();
+
+	return *this;
 }
 
 
@@ -198,29 +282,29 @@ Player::setup_pieces ()
 		_shuffler->Video.connect(bind(&Player::video, this, _1, _2));
 	}
 
-	for (auto i: playlist()->content()) {
+	for (auto content: playlist()->content()) {
 
-		if (!i->paths_valid ()) {
+		if (!content->paths_valid()) {
 			continue;
 		}
 
-		if (_ignore_video && _ignore_audio && i->text.empty()) {
+		if (_ignore_video && _ignore_audio && content->text.empty()) {
 			/* We're only interested in text and this content has none */
 			continue;
 		}
 
 		shared_ptr<Decoder> old_decoder;
 		for (auto j: old_pieces) {
-			if (j->content == i) {
+			if (j->content == content) {
 				old_decoder = j->decoder;
 				break;
 			}
 		}
 
-		auto decoder = decoder_factory(film, i, _fast, _tolerant, old_decoder);
+		auto decoder = decoder_factory(film, content, _fast, _tolerant, old_decoder);
 		DCPOMATIC_ASSERT (decoder);
 
-		FrameRateChange frc(film, i);
+		FrameRateChange frc(film, content);
 
 		if (decoder->video && _ignore_video) {
 			decoder->video->set_ignore (true);
@@ -244,7 +328,7 @@ Player::setup_pieces ()
 			}
 		}
 
-		auto piece = make_shared<Piece>(i, decoder, frc);
+		auto piece = make_shared<Piece>(content, decoder, frc);
 		_pieces.push_back (piece);
 
 		if (decoder->video) {