diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-07 23:22:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-01-07 23:23:08 +0100 |
| commit | 2ac6688e4e75ff26db9208e760966bd071dcc48f (patch) | |
| tree | b07e8890c13c23b7d3a05274965029697f4fc4dc /src/lib/dcp_content.cc | |
| parent | 89d4090c6b1bdf889c2302b92e1f4bf33cf7cf05 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index de71c1257..d72c0c43d 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -20,19 +20,19 @@ #include "atmos_content.h" -#include "dcp_content.h" -#include "video_content.h" #include "audio_content.h" -#include "dcp_examiner.h" -#include "job.h" -#include "film.h" -#include "config.h" -#include "overlaps.h" #include "compose.hpp" +#include "config.h" +#include "dcp_content.h" #include "dcp_decoder.h" -#include "log.h" +#include "dcp_examiner.h" #include "dcpomatic_log.h" +#include "film.h" +#include "job.h" +#include "log.h" +#include "overlaps.h" #include "text_content.h" +#include "video_content.h" #include <dcp/dcp.h> #include <dcp/raw_convert.h> #include <dcp/exceptions.h> @@ -690,7 +690,7 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c { shared_ptr<DCPDecoder> decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>())); + decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()); } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; @@ -725,7 +725,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri { shared_ptr<DCPDecoder> decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>())); + decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()); } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; |