diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:21:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:21:40 +0100 |
| commit | fbe2784c136fa1550815babfce89589f66b35a29 (patch) | |
| tree | 2099493253d82c71e7a1f2036bcbcbf980ab9f95 /src/tools | |
| parent | fe9d2a290682021cd12a00bf21fa4db3012e2049 (diff) | |
Simplification of name format stuff.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 6 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 01f8ef0a3..362d8105f 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -298,9 +298,9 @@ private: } dcp::NameFormat::Map name_values; - name_values["film_name"] = decrypted.content_title_text(); - name_values["from"] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day(); - name_values["to"] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day(); + name_values['f'] = decrypted.content_title_text(); + name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day(); + name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day(); if (_output->write_to()) { ScreenKDM::write_files (screen_kdms, _output->directory(), _output->name_format(), name_values); diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 38808596e..de89a9c7c 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -285,9 +285,9 @@ int main (int argc, char* argv[]) } dcp::NameFormat::Map values; - values["film_name"] = film->name(); - values["from"] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day(); - values["to"] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day(); + values['f'] = film->name(); + values['b'] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day(); + values['e'] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day(); try { list<ScreenKDM> screen_kdms = film->make_kdms ( |