X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=7a8d7cf349d532749ba69b8cfaf217d7bc232d41;hp=965ba7a0f781295119a726bbaa9d9524aa3d2eec;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hpb=1ac377eb46e4497d6f547f6d498d8c867343b331

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 965ba7a0f..7a8d7cf34 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,7 +22,6 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
-#include "wx/file_dialog_wrapper.h"
 #include "wx/file_picker_ctrl.h"
 #include "wx/full_config_dialog.h"
 #include "wx/job_view_dialog.h"
@@ -39,8 +38,10 @@
 #include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/dkdm_wrapper.h"
 #include "lib/exceptions.h"
+#include "lib/file_log.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
@@ -49,13 +50,14 @@
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
-#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/treectrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -180,8 +182,7 @@ public:
 		h = new StaticText (overall_panel, _("Output"));
 		h->SetFont (subheading_font);
 		right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
-		/* XXX: hard-coded non-interop here */
-		_output = new KDMOutputPanel (overall_panel, false);
+		_output = new KDMOutputPanel (overall_panel);
 		right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
 
 		_create = new Button (overall_panel, _("Create KDMs"));
@@ -204,6 +205,8 @@ public:
 		_export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this));
 
 		setup_sensitivity ();
+
+		dcpomatic_log = make_shared<FileLog>(State::write_path("kdm.log"));
 	}
 
 private:
@@ -339,7 +342,7 @@ private:
 						begin,
 						end,
 						decrypted.annotation_text().get_value_or (""),
-						decrypted.content_title_text(),
+						title,
 						dcp::LocalTime().as_string()
 						);
 
@@ -621,7 +624,7 @@ public:
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		wxSplashScreen* splash = nullptr;
 
@@ -691,7 +694,7 @@ private:
 	}
 
 	/* An unhandled exception has occurred inside the main event loop */
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		try {
 			throw;
@@ -720,7 +723,7 @@ private:
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		error_dialog (nullptr, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
 	}