X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=c1b66cd4c1b6ab96fa196cba6041764ae495f5db;hb=351942d335db261ac6fe54f2f8a3f439fef22d47;hp=45a74624f7da19564766b26ef2eba18da8f59b84;hpb=196de029044f4dbac5f74f68e08a89f778c3a236;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 45a74624f..c1b66cd4c 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,6 +35,7 @@
 #include "font.h"
 #include "util.h"
 #include "reel_writer.h"
+#include "text_content.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
@@ -62,11 +63,11 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::Data;
+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 */
@@ -105,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
 }
 
@@ -215,16 +216,14 @@ Writer::fake_write (Frame frame, Eyes eyes)
 	size_t const reel = video_reel (frame);
 	Frame const reel_frame = frame - _reels[reel].start ();
 
-	FILE* file = fopen_boost (_film->info_file(_reels[reel].period()), "rb");
-	if (!file) {
-		throw ReadFileError (_film->info_file(_reels[reel].period()));
-	}
-	dcp::FrameInfo info = _reels[reel].read_frame_info (file, reel_frame, eyes);
-	fclose (file);
-
 	QueueItem qi;
 	qi.type = QueueItem::FAKE;
-	qi.size = info.size;
+
+	{
+		shared_ptr<InfoFileHandle> info_file = _film->info_file_handle(_reels[reel].period(), true);
+		qi.size = _reels[reel].read_frame_info(info_file, reel_frame, eyes).size;
+	}
+
 	qi.reel = reel;
 	qi.frame = reel_frame;
 	if (_film->three_d() && eyes == EYES_BOTH) {
@@ -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
@@ -282,15 +284,12 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 			};
 
 			if (part_frames[0]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[0]));
-				part->copy_from (audio.get(), part_frames[0], 0, 0);
+				shared_ptr<AudioBuffers> part (new AudioBuffers(audio, part_frames[0], 0));
 				_audio_reel->write (part);
 			}
 
 			if (part_frames[1]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[1]));
-				part->copy_from (audio.get(), part_frames[1], part_frames[0], 0);
-				audio = part;
+				audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0]));
 			} else {
 				audio.reset ();
 			}
@@ -462,7 +461,7 @@ void
 Writer::terminate_thread (bool can_throw)
 {
 	boost::mutex::scoped_lock lock (_state_mutex);
-	if (_thread == 0) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
@@ -471,22 +470,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;
 	}
 
@@ -557,6 +551,8 @@ Writer::finish ()
 	meta.set_issue_date_now ();
 
 	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 ()) {
@@ -583,7 +579,7 @@ Writer::write_cover_sheet ()
 	boost::filesystem::path const cover = _film->file ("COVER_SHEET.txt");
 	FILE* f = fopen_boost (cover, "w");
 	if (!f) {
-		throw OpenFileError (cover, errno, false);
+		throw OpenFileError (cover, errno, OpenFileError::WRITE);
 	}
 
 	string text = Config::instance()->cover_sheet ();
@@ -591,7 +587,16 @@ Writer::write_cover_sheet ()
 	boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name());
 	boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->container_nickname());
 	boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language);
-	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language);
+
+	optional<string> subtitle_language;
+	BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+		BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+			if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
+				subtitle_language = j->language ();
+			}
+		}
+	}
+	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_language.get_value_or("None"));
 
 	boost::uintmax_t size = 0;
 	for (
@@ -767,4 +772,7 @@ Writer::set_digest_progress (Job* job, float progress)
 	}
 
 	job->set_progress (min_progress);
+
+	Waker waker;
+	waker.nudge ();
 }