Fix DKDM generation by moving the validity period a day inside the certificate validity.

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 546286e48bbc20d95ce70e615d82a252fd26a614..3168197d519b49d00eef7249734824f51e5deb5e 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -33,6 +33,7 @@
 #include "wx/recreate_chain_dialog.h"
 #include "wx/about_dialog.h"
 #include "wx/kdm_dialog.h"
+#include "wx/dkdm_dialog.h"
 #include "wx/self_dkdm_dialog.h"
 #include "wx/servers_list_dialog.h"
 #include "wx/hints_dialog.h"
@@ -221,11 +222,10 @@ enum {
        ID_file_close = 100,
        ID_edit_copy,
        ID_edit_paste,
-       ID_content_scale_to_fit_width,
-       ID_content_scale_to_fit_height,
        ID_jobs_make_dcp,
        ID_jobs_make_dcp_batch,
        ID_jobs_make_kdms,
+       ID_jobs_make_dkdms,
        ID_jobs_make_self_dkdm,
        ID_jobs_export,
        ID_jobs_send_dcp_to_tms,
@@ -261,6 +261,7 @@ public:
                , _servers_list_dialog (0)
                , _config_dialog (0)
                , _kdm_dialog (0)
+               , _dkdm_dialog (0)
                , _templates_dialog (0)
                , _file_menu (0)
                , _history_items (0)
@@ -313,10 +314,9 @@ public:
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this),               ID_edit_copy);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this),              ID_edit_paste);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this),        wxID_PREFERENCES);
-               Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width);
-               Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this),           ID_jobs_make_dcp);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this),          ID_jobs_make_kdms);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this),         ID_jobs_make_dkdms);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);
@@ -796,6 +796,21 @@ private:
                _kdm_dialog->Show ();
        }
 
+       void jobs_make_dkdms ()
+       {
+               if (!_film) {
+                       return;
+               }
+
+               if (_dkdm_dialog) {
+                       _dkdm_dialog->Destroy ();
+                       _dkdm_dialog = 0;
+               }
+
+               _dkdm_dialog = new DKDMDialog (this, _film);
+               _dkdm_dialog->Show ();
+       }
+
        /** @return false if we succeeded, true if not */
        bool send_to_other_tool (int port, function<void(boost::filesystem::path)> start, string message)
        {
@@ -890,9 +905,9 @@ private:
 
 
                dcp::LocalTime from (Config::instance()->signer_chain()->leaf().not_before());
-               from.add_minutes (1);
+               from.add_days (1);
                dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after());
-               to.add_minutes (-1);
+               to.add_days (-1);
 
                optional<dcp::EncryptedKDM> kdm;
                try {
@@ -964,22 +979,6 @@ private:
                d->Destroy ();
        }
 
-       void content_scale_to_fit_width ()
-       {
-               ContentList vc = _film_editor->content_panel()->selected_video ();
-               for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-                       (*i)->video->scale_and_crop_to_fit_width (_film);
-               }
-       }
-
-       void content_scale_to_fit_height ()
-       {
-               ContentList vc = _film_editor->content_panel()->selected_video ();
-               for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-                       (*i)->video->scale_and_crop_to_fit_height (_film);
-               }
-       }
-
        void jobs_send_dcp_to_tms ()
        {
                _film->send_dcp_to_tms ();
@@ -1304,15 +1303,12 @@ private:
                add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #endif
 
-               wxMenu* content = new wxMenu;
-               add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-               add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-
                wxMenu* jobs_menu = new wxMenu;
                add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
                add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION);
                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
+               add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
                add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
@@ -1345,7 +1341,6 @@ private:
 
                m->Append (_file_menu, _("&File"));
                m->Append (edit, _("&Edit"));
-               m->Append (content, _("&Content"));
                m->Append (jobs_menu, _("&Jobs"));
                m->Append (view, _("&View"));
                m->Append (tools, _("&Tools"));
@@ -1484,6 +1479,7 @@ private:
        ServersListDialog* _servers_list_dialog;
        wxPreferencesEditor* _config_dialog;
        KDMDialog* _kdm_dialog;
+       DKDMDialog* _dkdm_dialog;
        TemplatesDialog* _templates_dialog;
        wxMenu* _file_menu;
        shared_ptr<Film> _film;