Allow configuration of KDM filename format.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ac5b8a5448c15c91dd1b19264f5551f805893d92..e29d41db7dd5d9c3175694c16f480fc2dba3e5b0 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -492,20 +492,26 @@ private:
 
                try {
                        list<ScreenKDM> screen_kdms = _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation());
+
+                       NameFormat::Map name_values;
+                       name_values["film_name"] = _film->name();
+                       name_values["from"] = dcp::LocalTime(d->from()).date() + " " + dcp::LocalTime(d->from()).time_of_day();
+                       name_values["to"] = dcp::LocalTime(d->until()).date() + " " + dcp::LocalTime(d->until()).time_of_day();
+
                        if (d->write_to ()) {
                                ScreenKDM::write_files (
-                                       _film->name(),
                                        screen_kdms,
-                                       d->directory()
+                                       d->directory(),
+                                       d->name_format(),
+                                       name_values
                                        );
                        } else {
                                JobManager::instance()->add (
                                        shared_ptr<Job> (new SendKDMEmailJob (
-                                                                _film->name(),
-                                                                _film->dcp_name(),
-                                                                d->from(),
-                                                                d->until(),
                                                                 CinemaKDMs::collect (screen_kdms),
+                                                                d->name_format(),
+                                                                name_values,
+                                                                _film->dcp_name(),
                                                                 _film->log()
                                                                 ))
                                        );