From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 May 2017 11:15:27 +0000 (+0100)
Subject: Don't put seconds in KDM filenames.
X-Git-Tag: v2.11.5~13
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e2c4c7c601c411426798ff544d983c560eccce71;ds=sidebyside

Don't put seconds in KDM filenames.
---

diff --git a/cscript b/cscript
index 4ad3bce57..7abc75a75 100644
--- a/cscript
+++ b/cscript
@@ -280,7 +280,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
-            ('libdcp', 'a3032f3'),
+            ('libdcp', '181bc47'),
             ('libsub', 'a04f1d5'),
             ('rtaudio-cdist', None))
 
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index e06b9844b..01a86cd7f 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -293,8 +293,8 @@ int main (int argc, char* argv[])
 
 		dcp::NameFormat::Map values;
 		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();
+		values['b'] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day(true, false);
+		values['e'] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day(true, false);
 
 		try {
 			list<ScreenKDM> screen_kdms = film->make_kdms (
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 82c5210d2..6cd1af268 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -211,8 +211,8 @@ KDMOutputPanel::make (
 	try {
 		dcp::NameFormat::Map name_values;
 		name_values['f'] = name;
-		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();
+		name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(false, false);
+		name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false);
 
 		if (_write_to->GetValue()) {
 			if (_write_flat->GetValue()) {