Don't put seconds in KDM filenames.

diff --git a/cscript b/cscript
index 4ad3bce578886d4f7b1c2559782a72ef7b4b9d6e..7abc75a75f9543cce7a89c994eb4ba716e8a4e56 100644 (file)
--- 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 e06b9844bf2273850b645ce1cd0e2be6f98a994d..01a86cd7f53fb0813b6185d50137c42cff56275a 100644 (file)
--- 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 82c5210d2e20fdaf2c4e2a06e5d7163698d6b356..6cd1af2681e5ba137a1df9e17351387954c68768 100644 (file)
--- 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()) {