diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-08 21:32:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-08 21:32:44 +0200 |
| commit | 3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4 (patch) | |
| tree | 9cac355432ba25cc3d43017382d73e0640f50996 /src/lib/dcp.cc | |
| parent | 00762c2d9a4240d016150cd7555aee3dad8542ae (diff) | |
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/dcp.cc')
| -rw-r--r-- | src/lib/dcp.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index 06e3e15d5..d99c32bf3 100644 --- a/src/lib/dcp.cc +++ b/src/lib/dcp.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,19 +18,20 @@ */ -#include "dcp.h" -#include "config.h" -#include "film.h" -#include "log.h" -#include "dcpomatic_log.h" + #include "compose.hpp" +#include "dcp.h" #include "dcp_content.h" +#include "dcpomatic_log.h" +#include "log.h" +#include "util.h" #include <dcp/dcp.h> #include <dcp/decrypted_kdm.h> #include <dcp/exceptions.h> #include "i18n.h" + using std::list; using std::string; using std::shared_ptr; @@ -40,7 +41,7 @@ using std::vector; /** Find all the CPLs in our directories, cross-add assets and return the CPLs */ -list<shared_ptr<dcp::CPL> > +list<shared_ptr<dcp::CPL>> DCP::cpls () const { list<shared_ptr<dcp::DCP>> dcps; @@ -77,7 +78,7 @@ DCP::cpls () const } if (_dcp_content->kdm ()) { - dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get()); + auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get()); for (auto i: dcps) { i->add (k); } |