summaryrefslogtreecommitdiff
path: root/src/lib/cinema_kdms.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-01 00:48:15 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-01 00:48:15 +0100
commit1d022220899c63e2cae0a2a9a81f6c6db955a23d (patch)
treefdf436255ae717e6269d98626e9d45824fc77e82 /src/lib/cinema_kdms.cc
parent9c01623c3038b978ba732de2ad147d29fad60afe (diff)
Simplify NameFormat stuff.
Diffstat (limited to 'src/lib/cinema_kdms.cc')
-rw-r--r--src/lib/cinema_kdms.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 78e7c5ace..299cdf94e 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -27,7 +27,6 @@
#include "emailer.h"
#include "compose.hpp"
#include "log.h"
-#include "kdm_filename_format.h"
#include <zip.h>
#include <boost/foreach.hpp>
@@ -40,7 +39,7 @@ using std::runtime_error;
using boost::shared_ptr;
void
-CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMFilenameFormat name_format, dcp::NameFormat::Map name_values) const
+CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
{
int error;
struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
@@ -119,7 +118,7 @@ void
CinemaKDMs::write_zip_files (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
- KDMFilenameFormat name_format,
+ dcp::NameFormat name_format,
dcp::NameFormat::Map name_values
)
{
@@ -140,7 +139,7 @@ CinemaKDMs::write_zip_files (
void
CinemaKDMs::email (
list<CinemaKDMs> cinema_kdms,
- KDMFilenameFormat name_format,
+ dcp::NameFormat name_format,
dcp::NameFormat::Map name_values,
string cpl_name,
shared_ptr<Log> log