From: Carl Hetherington <cth@carlh.net>
Date: Wed, 31 Mar 2021 23:25:01 +0000 (+0200)
Subject: C++11 cleanup.
X-Git-Tag: v2.15.138~17
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=0a1aa72f11b7d5109caaa5d3ae0068e18dea6b56;p=dcpomatic.git

C++11 cleanup.
---

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index d4da787dd..37e8c9544 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -307,7 +307,7 @@ void
 Butler::prepare (weak_ptr<PlayerVideo> weak_video)
 try
 {
-	shared_ptr<PlayerVideo> video = weak_video.lock ();
+	auto video = weak_video.lock ();
 	/* If the weak_ptr cannot be locked the video obviously no longer requires any work */
 	if (video) {
 		LOG_TIMING("start-prepare in %1", thread_id());
@@ -363,7 +363,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate)
 optional<DCPTime>
 Butler::get_audio (float* out, Frame frames)
 {
-	optional<DCPTime> t = _audio.get (out, _audio_channels, frames);
+	auto t = _audio.get (out, _audio_channels, frames);
 	_summon.notify_all ();
 	return t;
 }
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 5f29b64da..fc0d5eab2 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -181,7 +181,7 @@ FFmpegEncoder::go ()
 			if (!v.first) {
 				throw DecodeError(String::compose("Error during decoding: %1", e.summary()));
 			}
-			shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
+			auto fe = encoder->get (v.first->eyes());
 			if (fe) {
 				fe->video(v.first, v.second);
 			}
@@ -194,7 +194,7 @@ FFmpegEncoder::go ()
 			_last_time = i;
 		}
 
-		shared_ptr<Job> job = _job.lock ();
+		auto job = _job.lock ();
 		if (job) {
 			job->set_progress (float(i.get()) / _film->length().get());
 		}