Merge.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 7cfcaa171..e06b9844b 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -302,24 +302,26 @@ int main (int argc, char* argv[])
 				);
 
 			if (zip) {
-				CinemaKDMs::write_zip_files (
+				int const N = CinemaKDMs::write_zip_files (
 					CinemaKDMs::collect (screen_kdms),
 					output,
+					Config::instance()->kdm_container_name_format(),
 					Config::instance()->kdm_filename_format(),
-					values
+					values,
+					bind (&always_overwrite)
 					);
 
 				if (verbose) {
-					cout << "Wrote ZIP files to " << output << "\n";
+					cout << "Wrote " << N << " ZIP files to " << output << "\n";
 				}
 			} else {
-				ScreenKDM::write_files (
+				int const N = ScreenKDM::write_files (
 					screen_kdms, output, Config::instance()->kdm_filename_format(), values,
 					bind (&always_overwrite)
 					);
 
 				if (verbose) {
-					cout << "Wrote KDM files to " << output << "\n";
+					cout << "Wrote " << N << " KDM files to " << output << "\n";
 				}
 			}
 		} catch (FileError& e) {