X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=3464a73d5ab10d74d793c3a82cd8c10e92911fcc;hb=4d987183766ee0d054b6462cf54afb86be1646c8;hp=979672fb4274e4ce110b08aad0189e993f168549;hpb=96f50dd5e600925488fdd9db1580aa01b026269b;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 979672fb4..3464a73d5 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -26,6 +26,7 @@
 
 #include "wx/about_dialog.h"
 #include "wx/content_panel.h"
+#include "wx/dcp_referencing_dialog.h"
 #include "wx/dkdm_dialog.h"
 #include "wx/export_subtitles_dialog.h"
 #include "wx/export_video_file_dialog.h"
@@ -75,6 +76,9 @@
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
 #include "lib/font_config.h"
+#ifdef DCPOMATIC_GROK
+#include "lib/grok/context.h"
+#endif
 #include "lib/hints.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
@@ -206,6 +210,7 @@ private:
 #define NEEDS_SELECTED_VIDEO_CONTENT  0x20
 #define NEEDS_CLIPBOARD               0x40
 #define NEEDS_ENCRYPTION              0x80
+#define NEEDS_DCP_CONTENT             0x100
 
 
 map<wxMenuItem*, int> menu_items;
@@ -235,6 +240,7 @@ enum {
 	ID_jobs_open_dcp_in_player,
 	ID_view_closed_captions,
 	ID_view_video_waveform,
+	ID_tools_version_file,
 	ID_tools_hints,
 	ID_tools_encoding_servers,
 	ID_tools_manage_templates,
@@ -346,6 +352,7 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this),    ID_view_closed_captions);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_video_waveform, this),     ID_view_video_waveform);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_version_file, this),      ID_tools_version_file);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_hints, this),             ID_tools_hints);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this),  ID_tools_encoding_servers);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_manage_templates, this),  ID_tools_manage_templates);
@@ -762,7 +769,17 @@ private:
 			);
 
 		if (dialog.ShowModal() == wxID_OK) {
-			save_all_config_as_zip(wx_to_std(dialog.GetPath()));
+			auto const path = boost::filesystem::path(wx_to_std(dialog.GetPath()));
+			if (boost::filesystem::exists(path)) {
+				boost::system::error_code ec;
+				boost::filesystem::remove(path, ec);
+				if (ec) {
+					error_dialog(nullptr, _("Could not remove existing preferences file"), std_to_wx(path.string()));
+					return;
+				}
+			}
+
+			save_all_config_as_zip(path);
 		}
 	}
 
@@ -1052,6 +1069,17 @@ private:
 		_system_information_dialog->Show ();
 	}
 
+	void tools_version_file()
+	{
+		if (_dcp_referencing_dialog) {
+			_dcp_referencing_dialog->Destroy();
+			_dcp_referencing_dialog = nullptr;
+		}
+
+		_dcp_referencing_dialog = new DCPReferencingDialog(this, _film);
+		_dcp_referencing_dialog->Show();
+	}
+
 	void tools_hints ()
 	{
 		if (!_hints_dialog) {
@@ -1180,6 +1208,7 @@ private:
 		FontConfig::drop();
 
 		ev.Skip ();
+		JobManager::drop ();
 	}
 
 	void active_jobs_changed()
@@ -1203,6 +1232,13 @@ private:
 		bool const have_single_selected_content = _film_editor->content_panel()->selected().size() == 1;
 		bool const have_selected_content = !_film_editor->content_panel()->selected().empty();
 		bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty();
+		vector<shared_ptr<Content>> content;
+		if (_film) {
+			content = _film->content();
+		}
+		bool const have_dcp_content = std::find_if(content.begin(), content.end(), [](shared_ptr<const Content> content) {
+			return static_cast<bool>(dynamic_pointer_cast<const DCPContent>(content));
+		}) != content.end();
 
 		for (auto j: menu_items) {
 
@@ -1240,6 +1276,10 @@ private:
 				enabled = false;
 			}
 
+			if ((j.second & NEEDS_DCP_CONTENT) && !have_dcp_content) {
+				enabled = false;
+			}
+
 			j.first->Enable (enabled);
 		}
 	}
@@ -1373,6 +1413,7 @@ private:
 		add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM);
 
 		auto tools = new wxMenu;
+		add_item (tools, _("Version File (VF)..."), ID_tools_version_file, NEEDS_FILM | NEEDS_DCP_CONTENT);
 		add_item (tools, _("Hints..."), ID_tools_hints, NEEDS_FILM);
 		add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
 		add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0);
@@ -1543,6 +1584,7 @@ private:
 	StandardControls* _controls;
 	wx_ptr<VideoWaveformDialog> _video_waveform_dialog;
 	SystemInformationDialog* _system_information_dialog = nullptr;
+	DCPReferencingDialog* _dcp_referencing_dialog = nullptr;
 	HintsDialog* _hints_dialog = nullptr;
 	ServersListDialog* _servers_list_dialog = nullptr;
 	wxPreferencesEditor* _config_dialog = nullptr;
@@ -1582,6 +1624,7 @@ public:
 	App ()
 		: wxApp ()
 	{
+		dcpomatic_setup_path_encoding ();
 #ifdef DCPOMATIC_LINUX
 		XInitThreads ();
 #endif
@@ -1634,8 +1677,6 @@ private:
 			make_foreground_application ();
 #endif
 
-			dcpomatic_setup_path_encoding ();
-
 			/* Enable i18n; this will create a Config object
 			   to look for a force-configured language.  This Config
 			   object will be wrong, however, because dcpomatic_setup
@@ -1711,6 +1752,10 @@ private:
 				notes.Centre();
 				notes.ShowModal();
 			}
+
+#ifdef DCPOMATIC_GROK
+			grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+#endif
 		}
 		catch (exception& e)
 		{