c++11 tidying.

3 files changed, 27 insertions, 26 deletions

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d35a0625f..2f7416c62 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,6 +34,7 @@
 #include "i18n.h"
 
 using std::cout;
+using std::make_shared;
 using std::shared_ptr;
 using dcp::Size;
 using namespace dcpomatic;
@@ -43,7 +44,7 @@ ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageC
 	, _image_content (c)
 	, _frame_video_position (0)
 {
-	video.reset (new VideoDecoder (this, c));
+	video = make_shared<VideoDecoder>(this, c);
 }
 
 bool
@@ -55,7 +56,7 @@ ImageDecoder::pass ()
 
 	if (!_image_content->still() || !_image) {
 		/* Either we need an image or we are using moving images, so load one */
-		boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
+		auto path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
 		if (valid_j2k_file (path)) {
 			AVPixelFormat pf;
 			if (_image_content->video->colour_conversion()) {
@@ -68,9 +69,9 @@ ImageDecoder::pass ()
 			/* We can't extract image size from a JPEG2000 codestream without decoding it,
 			   so pass in the image content's size here.
 			*/
-			_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
+			_image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
 		} else {
-			_image.reset (new FFmpegImageProxy(path, _image_content->video->range()));
+			_image = make_shared<FFmpegImageProxy>(path, _image_content->video->range());
 		}
 	}
 
diff --git a/src/lib/job.cc b/src/lib/job.cc
index f0d8fcbbc..b1ff0fb32 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -104,7 +104,7 @@ Job::run_wrapper ()
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
 		try {
-			boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
+			auto const s = boost::filesystem::space (e.filename());
 			if (s.available < pow (1024, 3)) {
 				m += N_("\n\n");
 				m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
@@ -478,8 +478,8 @@ Job::status () const
 		s += buffer;
 
 		if (t > 10 && r > 0) {
-			boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
-			boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
+			auto now = boost::posix_time::second_clock::local_time();
+			auto finish = now + boost::posix_time::seconds(r);
 			char finish_string[16];
 			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
 			string day;
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 4933de71b..14e482467 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -97,7 +97,7 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 	_size.height = node->number_child<int> ("VideoHeight");
 
 	/* Backwards compatibility */
-	optional<double> r = node->optional_number_child<double>("VideoFrameRate");
+	auto r = node->optional_number_child<double>("VideoFrameRate");
 	if (r) {
 		_parent->set_video_frame_rate (r.get ());
 	}
@@ -143,11 +143,11 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 			_legacy_ratio = Ratio::from_id(r.get())->ratio();
 		}
 	} else if (version <= 37) {
-		optional<string> ratio = node->node_child("Scale")->optional_string_child("Ratio");
+		auto ratio = node->node_child("Scale")->optional_string_child("Ratio");
 		if (ratio) {
 			_legacy_ratio = Ratio::from_id(ratio.get())->ratio();
 		}
-		optional<bool> scale = node->node_child("Scale")->optional_bool_child("Scale");
+		auto scale = node->node_child("Scale")->optional_bool_child("Scale");
 		if (scale) {
 			if (*scale) {
 				/* This is what we used to call "no stretch" */
@@ -189,7 +189,7 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 	, _length (0)
 	, _yuv (false)
 {
-	shared_ptr<VideoContent> ref = c[0]->video;
+	auto ref = c[0]->video;
 	DCPOMATIC_ASSERT (ref);
 
 	for (size_t i = 1; i < c.size(); ++i) {
@@ -277,11 +277,11 @@ void
 VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 {
 	/* These examiner calls could call other content methods which take a lock on the mutex */
-	dcp::Size const vs = d->video_size ();
-	Frame vl = d->video_length ();
-	optional<double> const ar = d->sample_aspect_ratio ();
-	bool const yuv = d->yuv ();
-	VideoRange const range = d->range ();
+	auto const vs = d->video_size ();
+	auto vl = d->video_length ();
+	auto const ar = d->sample_aspect_ratio ();
+	auto const yuv = d->yuv ();
+	auto const range = d->range ();
 
 	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
 	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
@@ -353,7 +353,7 @@ VideoContent::technical_summary () const
 dcp::Size
 VideoContent::size_after_3d_split () const
 {
-	dcp::Size const s = size ();
+	auto const s = size ();
 	switch (frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
 	case VIDEO_FRAME_TYPE_3D:
@@ -388,12 +388,12 @@ VideoContent::fade (shared_ptr<const Film> film, Frame f) const
 
 	double const vfr = _parent->active_video_frame_rate(film);
 
-	Frame const ts = _parent->trim_start().frames_round(vfr);
+	auto const ts = _parent->trim_start().frames_round(vfr);
 	if ((f - ts) < fade_in()) {
 		return double (f - ts) / fade_in();
 	}
 
-	Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
+	auto fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
 	if (f >= fade_out_start) {
 		return 1 - double (f - fade_out_start) / fade_out();
 	}
@@ -438,8 +438,8 @@ VideoContent::processing_description (shared_ptr<const Film> film)
 		d += buffer;
 	}
 
-	dcp::Size const container_size = film->frame_size ();
-	dcp::Size const scaled = scaled_size (container_size);
+	auto const container_size = film->frame_size ();
+	auto const scaled = scaled_size (container_size);
 
 	if (scaled != size_after_crop ()) {
 		d += String::compose (
@@ -602,11 +602,11 @@ VideoContent::scaled_size (dcp::Size film_container)
 		return *_custom_size;
 	}
 
-	dcp::Size size = size_after_crop ();
+	auto size = size_after_crop ();
 	size.width *= _sample_aspect_ratio.get_value_or(1);
 
 	/* This is what we will return unless there is any legacy stuff to take into account */
-	dcp::Size auto_size = fit_ratio_within (size.ratio(), film_container);
+	auto auto_size = fit_ratio_within (size.ratio(), film_container);
 
 	if (_legacy_ratio) {
 		if (fit_ratio_within(*_legacy_ratio, film_container) != auto_size) {