From 3370a67e8a9aeaec45911ba1c714a0d259781fdf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 11 Apr 2021 20:49:18 +0200
Subject: Small bits of tidying up.

---
 src/cpl.cc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/cpl.cc')

diff --git a/src/cpl.cc b/src/cpl.cc
index 8766cf76..39e78baa 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -58,16 +58,17 @@
 #include <boost/algorithm/string.hpp>
 
 
-using std::string;
+using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::pair;
 using std::make_pair;
-using std::cout;
+using std::make_shared;
+using std::pair;
 using std::set;
-using std::vector;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
-using std::dynamic_pointer_cast;
 using namespace dcp;
 
 
@@ -291,9 +292,9 @@ CPL::read_composition_metadata_asset (cxml::ConstNodePtr node)
 		/* If the first language on SubtitleLanguageList is the same as the language of the first subtitle we'll ignore it */
 		size_t first = 0;
 		if (!_reels.empty()) {
-			shared_ptr<dcp::ReelSubtitleAsset> sub = _reels.front()->main_subtitle();
+			auto sub = _reels.front()->main_subtitle();
 			if (sub) {
-				optional<string> lang = sub->language();
+				auto lang = sub->language();
 				if (lang && lang == sll_split[0]) {
 					first = 1;
 				}
-- 
cgit v1.2.3