summaryrefslogtreecommitdiff
path: root/src/lib/kdm_with_metadata.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-08 21:32:44 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-08 21:32:44 +0200
commit3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4 (patch)
tree9cac355432ba25cc3d43017382d73e0640f50996 /src/lib/kdm_with_metadata.h
parent00762c2d9a4240d016150cd7555aee3dad8542ae (diff)
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/kdm_with_metadata.h')
-rw-r--r--src/lib/kdm_with_metadata.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index fc80a8743..99c2ef8dc 100644
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -18,14 +18,18 @@
*/
+
#ifndef DCPOMATIC_KDM_WITH_METADATA_H
#define DCPOMATIC_KDM_WITH_METADATA_H
+
#include <dcp/encrypted_kdm.h>
#include <dcp/name_format.h>
+
class Cinema;
+
class KDMWithMetadata
{
public:
@@ -78,11 +82,11 @@ int write_files (
void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format);
-std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr> kdms);
+std::list<std::list<KDMWithMetadataPtr>> collect (std::list<KDMWithMetadataPtr> kdms);
int write_directories (
- std::list<std::list<KDMWithMetadataPtr> > kdms,
+ std::list<std::list<KDMWithMetadataPtr>> kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
@@ -91,7 +95,7 @@ int write_directories (
int write_zip_files (
- std::list<std::list<KDMWithMetadataPtr> > kdms,
+ std::list<std::list<KDMWithMetadataPtr>> kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
@@ -100,7 +104,7 @@ int write_zip_files (
void email (
- std::list<std::list<KDMWithMetadataPtr> > kdms,
+ std::list<std::list<KDMWithMetadataPtr>> kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
std::string cpl_name