X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=d85db56894ccb59525ab18ef00303810a08d7ee6;hp=9a0f83a22a5c184d68c3b5c5bc07789fe9fe3bca;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hpb=1580bdc52a257870c908f32d2abe6fed84d83c50

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 9a0f83a22..d85db5689 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -68,7 +68,6 @@ using namespace dcpomatic;
 Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 	: _film (film)
 	, _job (j)
-	, _thread (0)
 	, _finish (false)
 	, _queued_full_in_memory (0)
 	/* These will be reset to sensible values when J2KEncoder is created */
@@ -107,9 +106,9 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 void
 Writer::start ()
 {
-	_thread = new boost::thread (boost::bind (&Writer::thread, this));
+	_thread = boost::thread (boost::bind(&Writer::thread, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_thread->native_handle(), "writer");
+	pthread_setname_np (_thread.native_handle(), "writer");
 #endif
 }
 
@@ -269,8 +268,11 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 			/* Easy case: we can write all the audio to this reel */
 			_audio_reel->write (audio);
 			t = end;
+		} else if (_audio_reel->period().to <= t) {
+			/* This reel is entirely before the start of our audio; just skip the reel */
+			++_audio_reel;
 		} else {
-			/* Split the audio into two and write the first part */
+			/* This audio is over a reel boundary; split the audio into two and write the first part */
 			DCPTime part_lengths[2] = {
 				_audio_reel->period().to - t,
 				end - _audio_reel->period().to
@@ -462,7 +464,7 @@ void
 Writer::terminate_thread (bool can_throw)
 {
 	boost::mutex::scoped_lock lock (_state_mutex);
-	if (_thread == 0) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
@@ -471,22 +473,17 @@ Writer::terminate_thread (bool can_throw)
 	_full_condition.notify_all ();
 	lock.unlock ();
 
-	if (_thread->joinable ()) {
-		_thread->join ();
-	}
+	_thread.join ();
 
 	if (can_throw) {
 		rethrow ();
 	}
-
-	delete _thread;
-	_thread = 0;
 }
 
 void
 Writer::finish ()
 {
-	if (!_thread) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
@@ -558,6 +555,7 @@ Writer::finish ()
 
 	cpl->set_metadata (meta);
 	cpl->set_ratings (vector_to_list(_film->ratings()));
+	cpl->set_content_version_label_text (_film->content_version());
 
 	shared_ptr<const dcp::CertificateChain> signer;
 	if (_film->is_signed ()) {
@@ -777,4 +775,7 @@ Writer::set_digest_progress (Job* job, float progress)
 	}
 
 	job->set_progress (min_progress);
+
+	Waker waker;
+	waker.nudge ();
 }