X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=6a0349b3125cb97052bc6d8fc0607052a3218c5d;hb=03c5a8155043613c01e0e151735a7fcf8ab84415;hp=c05dd613857db93776e1d6a288e9d7d2fd343e8c;hpb=47e78514ffa98c991ddd38d077836f4a558fbec0;p=dcpomatic.git diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index c05dd6138..6a0349b31 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -64,7 +64,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam } name_values['s'] = i.screen->name; - string const name = name_format.get(name_values) + ".xml"; + string const name = name_format.get(name_values, ".xml"); if (zip_add (zip, name.c_str(), source) == -1) { throw runtime_error ("failed to add KDM to ZIP archive"); } @@ -128,7 +128,7 @@ CinemaKDMs::write_zip_files ( BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; name_values['c'] = i.cinema->name; - path /= name_format.get(name_values) + ".zip"; + path /= name_format.get(name_values, ".zip"); i.make_zip_file (path, name_format, name_values); } } @@ -189,7 +189,7 @@ CinemaKDMs::email ( email.add_bcc (config->kdm_bcc ()); } - email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip"); + email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip"); Config* c = Config::instance ();