projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and whitespace cleanups.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index eb1c5f42c2a3a5b525da1f01fe219fc72ef8e7fd..6df0588e972fb439f6eb0b501bc9e1c7b5d99ea4 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-202
2
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,19
+20,19
@@
#include "atmos_content.h"
#include "atmos_content.h"
-#include "dcp_content.h"
-#include "video_content.h"
#include "audio_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 "compose.hpp"
+#include "config.h"
+#include "dcp_content.h"
#include "dcp_decoder.h"
#include "dcp_decoder.h"
-#include "
log
.h"
+#include "
dcp_examiner
.h"
#include "dcpomatic_log.h"
#include "dcpomatic_log.h"
+#include "film.h"
+#include "job.h"
+#include "log.h"
+#include "overlaps.h"
#include "text_content.h"
#include "text_content.h"
+#include "video_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
@@
-176,10
+176,10
@@
DCPContent::read_directory (boost::filesystem::path p)
bool have_assetmap = false;
bool have_metadata = false;
bool have_assetmap = false;
bool have_metadata = false;
- for (
directory_iterator i(p); i != directory_iterator(); ++i
) {
- if (i
->path().filename() == "ASSETMAP" || i->
path().filename() == "ASSETMAP.xml") {
+ for (
auto i: directory_iterator(p)
) {
+ if (i
.path().filename() == "ASSETMAP" || i.
path().filename() == "ASSETMAP.xml") {
have_assetmap = true;
have_assetmap = true;
- } else if (i
->
path().filename() == "metadata.xml") {
+ } else if (i
.
path().filename() == "metadata.xml") {
have_metadata = true;
}
}
have_metadata = true;
}
}
@@
-690,7
+690,7
@@
DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
{
shared_ptr<DCPDecoder> decoder;
try {
{
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;
} 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 {
{
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;
} catch (dcp::ReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;