X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=e47fa973b8841b21c5cfdebdba8784f770b51123;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=77a6bb589183de5e159898204617eeab3b7d156c;hpb=ddcd4f3ba0af3e9d49dbb68127317cd0d871a248;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 77a6bb589..e47fa973b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -38,8 +38,7 @@
 #include "text_content.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
-#include <dcp/reel_mxf.h>
-#include <boost/foreach.hpp>
+#include <dcp/reel_file_asset.h>
 #include <fstream>
 #include <cerrno>
 #include <iostream>
@@ -59,9 +58,9 @@ using std::map;
 using std::min;
 using std::max;
 using std::vector;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -100,8 +99,8 @@ Writer::Writer (weak_ptr<const Film> weak_film, weak_ptr<Job> j, bool text_only)
 	shared_ptr<Job> job = _job.lock ();
 
 	int reel_index = 0;
-	list<DCPTimePeriod> const reels = film()->reels();
-	BOOST_FOREACH (DCPTimePeriod p, reels) {
+	auto const reels = film()->reels();
+	for (auto p: reels) {
 		_reels.push_back (ReelWriter(weak_film, p, job, reel_index++, reels.size(), text_only));
 	}
 
@@ -112,7 +111,7 @@ Writer::Writer (weak_ptr<const Film> weak_film, weak_ptr<Job> j, bool text_only)
 	*/
 	_audio_reel = _reels.begin ();
 	_subtitle_reel = _reels.begin ();
-	BOOST_FOREACH (DCPTextTrack i, film()->closed_caption_tracks()) {
+	for (auto i: film()->closed_caption_tracks()) {
 		_caption_reels[i] = _reels.begin ();
 	}
 	_atmos_reel = _reels.begin ();
@@ -166,12 +165,12 @@ Writer::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 	qi.reel = video_reel (frame);
 	qi.frame = frame - _reels[qi.reel].start ();
 
-	if (film()->three_d() && eyes == EYES_BOTH) {
+	if (film()->three_d() && eyes == Eyes::BOTH) {
 		/* 2D material in a 3D DCP; fake the 3D */
-		qi.eyes = EYES_LEFT;
+		qi.eyes = Eyes::LEFT;
 		_queue.push_back (qi);
 		++_queued_full_in_memory;
-		qi.eyes = EYES_RIGHT;
+		qi.eyes = Eyes::RIGHT;
 		_queue.push_back (qi);
 		++_queued_full_in_memory;
 	} else {
@@ -211,10 +210,10 @@ Writer::repeat (Frame frame, Eyes eyes)
 	qi.type = QueueItem::REPEAT;
 	qi.reel = video_reel (frame);
 	qi.frame = frame - _reels[qi.reel].start ();
-	if (film()->three_d() && eyes == EYES_BOTH) {
-		qi.eyes = EYES_LEFT;
+	if (film()->three_d() && eyes == Eyes::BOTH) {
+		qi.eyes = Eyes::LEFT;
 		_queue.push_back (qi);
-		qi.eyes = EYES_RIGHT;
+		qi.eyes = Eyes::RIGHT;
 		_queue.push_back (qi);
 	} else {
 		qi.eyes = eyes;
@@ -251,10 +250,10 @@ Writer::fake_write (Frame frame, Eyes eyes)
 
 	qi.reel = reel;
 	qi.frame = frame_in_reel;
-	if (film()->three_d() && eyes == EYES_BOTH) {
-		qi.eyes = EYES_LEFT;
+	if (film()->three_d() && eyes == Eyes::BOTH) {
+		qi.eyes = Eyes::LEFT;
 		_queue.push_back (qi);
-		qi.eyes = EYES_RIGHT;
+		qi.eyes = Eyes::RIGHT;
 		_queue.push_back (qi);
 	} else {
 		qi.eyes = eyes;
@@ -356,18 +355,18 @@ Writer::have_sequenced_image_at_queue_head ()
 bool
 Writer::LastWritten::next (QueueItem qi) const
 {
-	if (qi.eyes == EYES_BOTH) {
+	if (qi.eyes == Eyes::BOTH) {
 		/* 2D */
 		return qi.frame == (_frame + 1);
 	}
 
 	/* 3D */
 
-	if (_eyes == EYES_LEFT && qi.frame == _frame && qi.eyes == EYES_RIGHT) {
+	if (_eyes == Eyes::LEFT && qi.frame == _frame && qi.eyes == Eyes::RIGHT) {
 		return true;
 	}
 
-	if (_eyes == EYES_RIGHT && qi.frame == (_frame + 1) && qi.eyes == EYES_LEFT) {
+	if (_eyes == Eyes::RIGHT && qi.frame == (_frame + 1) && qi.eyes == Eyes::LEFT) {
 		return true;
 	}
 
@@ -413,7 +412,7 @@ try
 			/* (Hopefully temporarily) log anything that was not written */
 			if (!_queue.empty() && !have_sequenced_image_at_queue_head()) {
 				LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size());
-				BOOST_FOREACH (QueueItem const& i, _queue) {
+				for (auto const& i: _queue) {
 					if (i.type == QueueItem::FULL) {
 						LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i.frame, (int) i.eyes);
 					} else {
@@ -537,7 +536,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 
 	LOG_GENERAL_NC ("Finishing ReelWriters");
 
-	BOOST_FOREACH (ReelWriter& i, _reels) {
+	for (auto& i: _reels) {
 		i.finish (output_dcp);
 	}
 
@@ -579,7 +578,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 		set_progress = &ignore_progress;
 	}
 
-	BOOST_FOREACH (ReelWriter& i, _reels) {
+	for (auto& i: _reels) {
 		service.post (boost::bind (&ReelWriter::calculate_digests, &i, set_progress));
 	}
 	service.post (boost::bind (&Writer::calculate_referenced_digests, this, set_progress));
@@ -590,7 +589,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 
 	/* Add reels */
 
-	BOOST_FOREACH (ReelWriter& i, _reels) {
+	for (auto& i: _reels) {
 		cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp, _have_subtitles, _have_closed_captions));
 	}
 
@@ -609,7 +608,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 	cpl->set_ratings (film()->ratings());
 
 	vector<dcp::ContentVersion> cv;
-	BOOST_FOREACH (string i, film()->content_versions()) {
+	for (auto i: film()->content_versions()) {
 		cv.push_back (dcp::ContentVersion(i));
 	}
 	cpl->set_content_versions (cv);
@@ -624,15 +623,15 @@ Writer::finish (boost::filesystem::path output_dcp)
 	cpl->set_facility (film()->facility());
 	cpl->set_luminance (film()->luminance());
 
-	list<int> ac = film()->mapped_audio_channels();
+	auto ac = film()->mapped_audio_channels();
 	dcp::MCASoundField field = (
-		find(ac.begin(), ac.end(), static_cast<int>(dcp::BSL)) != ac.end() ||
-		find(ac.begin(), ac.end(), static_cast<int>(dcp::BSR)) != ac.end()
-		) ? dcp::SEVEN_POINT_ONE : dcp::FIVE_POINT_ONE;
+		find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSL)) != ac.end() ||
+		find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSR)) != ac.end()
+		) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE;
 
 	dcp::MainSoundConfiguration msc (field, film()->audio_channels());
-	BOOST_FOREACH (int i, ac) {
-		if (i < film()->audio_channels()) {
+	for (auto i: ac) {
+		if (static_cast<int>(i) < film()->audio_channels()) {
 			msc.set_mapping (i, static_cast<dcp::Channel>(i));
 		}
 	}
@@ -656,11 +655,11 @@ Writer::finish (boost::filesystem::path output_dcp)
 	}
 
 	dcp.write_xml (
-		film()->interop() ? dcp::INTEROP : dcp::SMPTE,
+		film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE,
 		issuer,
 		creator,
 		dcp::LocalTime().as_string(),
-		String::compose("Created by libdcp %1", dcp::version),
+		film()->dcp_name(),
 		signer,
 		Config::instance()->dcp_metadata_filename_format()
 		);
@@ -761,18 +760,18 @@ Writer::can_fake_write (Frame frame) const
 	return (frame != 0 && frame < reel.first_nonexistant_frame());
 }
 
-/** @param track Closed caption track if type == TEXT_CLOSED_CAPTION */
+/** @param track Closed caption track if type == TextType::CLOSED_CAPTION */
 void
 Writer::write (PlayerText text, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	vector<ReelWriter>::iterator* reel = 0;
+	vector<ReelWriter>::iterator* reel = nullptr;
 
 	switch (type) {
-	case TEXT_OPEN_SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		reel = &_subtitle_reel;
 		_have_subtitles = true;
 		break;
-	case TEXT_CLOSED_CAPTION:
+	case TextType::CLOSED_CAPTION:
 		DCPOMATIC_ASSERT (track);
 		DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end());
 		reel = &_caption_reels[*track];
@@ -796,9 +795,9 @@ Writer::write (vector<FontData> fonts)
 {
 	/* Just keep a list of unique fonts and we'll deal with them in ::finish */
 
-	BOOST_FOREACH (FontData const& i, fonts) {
+	for (auto const& i: fonts) {
 		bool got = false;
-		BOOST_FOREACH (FontData const& j, _fonts) {
+		for (auto& j: _fonts) {
 			if (i == j) {
 				got = true;
 			}
@@ -847,7 +846,7 @@ Writer::write (ReferencedReelAsset asset)
 size_t
 Writer::video_reel (int frame) const
 {
-	DCPTime t = DCPTime::from_frames (frame, film()->video_frame_rate());
+	auto t = DCPTime::from_frames (frame, film()->video_frame_rate());
 	size_t i = 0;
 	while (i < _reels.size() && !_reels[i].period().contains (t)) {
 		++i;
@@ -864,8 +863,8 @@ Writer::set_digest_progress (Job* job, float progress)
 
 	_digest_progresses[boost::this_thread::get_id()] = progress;
 	float min_progress = FLT_MAX;
-	for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
-		min_progress = min (min_progress, i->second);
+	for (auto const& i: _digest_progresses) {
+		min_progress = min (min_progress, i.second);
 	}
 
 	job->set_progress (min_progress);
@@ -879,11 +878,11 @@ Writer::set_digest_progress (Job* job, float progress)
 void
 Writer::calculate_referenced_digests (boost::function<void (float)> set_progress)
 {
-	BOOST_FOREACH (ReferencedReelAsset const& i, _reel_assets) {
-		shared_ptr<dcp::ReelMXF> mxf = dynamic_pointer_cast<dcp::ReelMXF>(i.asset);
-		if (mxf && !mxf->hash()) {
-			mxf->asset_ref().asset()->hash (set_progress);
-			mxf->set_hash (mxf->asset_ref().asset()->hash());
+	for (auto const& i: _reel_assets) {
+		auto file = dynamic_pointer_cast<dcp::ReelFileAsset>(i.asset);
+		if (file && !file->hash()) {
+			file->asset_ref().asset()->hash (set_progress);
+			file->set_hash (file->asset_ref().asset()->hash());
 		}
 	}
 }