Basic and rather clumsy option to respect KDM validity windows.

8 files changed, 70 insertions, 0 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 30271283b..373b71df6 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -164,6 +164,7 @@ Config::set_defaults ()
 	_gdc_password = optional<string>();
 	_interface_complexity = INTERFACE_SIMPLE;
 	_player_mode = PLAYER_MODE_WINDOW;
+	_respect_kdm_validity_periods = false;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -491,6 +492,8 @@ try
 		_player_mode = PLAYER_MODE_DUAL;
 	}
 
+	_respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(false);
+
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
 		cxml::Document f ("Cinemas");
@@ -876,6 +879,8 @@ Config::write_config () const
 		break;
 	}
 
+	root->add_child("RespectKDMValidityPeriods")->add_child_text(_respect_kdm_validity_periods ? "1" : "0");
+
 	try {
 		doc.write_to_file_formatted(config_file().string());
 	} catch (xmlpp::exception& e) {
diff --git a/src/lib/config.h b/src/lib/config.h
index d2829af08..c8ae32efd 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -469,6 +469,10 @@ public:
 		return _player_mode;
 	}
 
+	bool respect_kdm_validity_periods () const {
+		return _respect_kdm_validity_periods;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -871,6 +875,10 @@ public:
 		maybe_set (_player_mode, m);
 	}
 
+	void set_respect_kdm_validity_periods (bool r) {
+		maybe_set (_respect_kdm_validity_periods, r);
+	}
+
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1054,6 +1062,7 @@ private:
 	boost::optional<std::string> _gdc_password;
 	Interface _interface_complexity;
 	PlayerMode _player_mode;
+	bool _respect_kdm_validity_periods;
 
 	static int const _current_version;
 
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index a2874a604..3498cc961 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -657,3 +657,14 @@ DCPContent::set_cpl (string id)
 		_cpl = id;
 	}
 }
+
+bool
+DCPContent::kdm_timing_window_valid () const
+{
+	if (!_kdm) {
+		return true;
+	}
+
+	dcp::LocalTime now;
+	return _kdm->not_valid_before() < now && now < _kdm->not_valid_after();
+}
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 43476e729..db617afa2 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -138,6 +138,8 @@ public:
 		return _three_d;
 	}
 
+	bool kdm_timing_window_valid () const;
+
 private:
 	friend class reels_test5;
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 10b75b03d..53947527f 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -162,6 +162,7 @@ public:
 		_viewer.reset (new FilmViewer (_overall_panel));
 		_controls = new Controls (_overall_panel, _viewer);
 		_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
+		_viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
 		_info = new PlayerInformation (_overall_panel, _viewer);
 		wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
 		main_sizer->Add (_viewer->panel(), 1, wxEXPAND);
@@ -197,6 +198,27 @@ public:
 		setup_screen ();
 	}
 
+	bool playback_permitted ()
+	{
+		if (!_film || !Config::instance()->respect_kdm_validity_periods()) {
+			return true;
+		}
+
+		bool ok = true;
+		BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+			shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+			if (d && !d->kdm_timing_window_valid()) {
+				ok = false;
+			}
+		}
+
+		if (!ok) {
+			error_dialog (this, _("The KDM does not allow playback of this content at this time."));
+		}
+
+		return ok;
+	}
+
 	void set_decode_reduction (optional<int> reduction)
 	{
 		_viewer->set_dcp_decode_reduction (reduction);
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index c062524e9..d45da2021 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -406,6 +406,12 @@ FilmViewer::start ()
 		return;
 	}
 
+	optional<bool> v = PlaybackPermitted ();
+	if (v && !*v) {
+		/* Computer says no */
+		return;
+	}
+
 	if (_audio.isStreamOpen()) {
 		_audio.setStreamTime (_video_position.seconds());
 		_audio.startStream ();
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 029ec0323..0e44994de 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -93,6 +93,8 @@ public:
 	boost::signals2::signal<void ()> Stopped;
 	boost::signals2::signal<void ()> FilmChanged;
 
+	boost::signals2::signal<bool ()> PlaybackPermitted;
+
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 258db9a57..c84c8b212 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -94,7 +94,12 @@ private:
 		table->Add (_player_mode, wxGBPosition(r, 1));
 		++r;
 
+		_respect_kdm = new wxCheckBox (_panel, wxID_ANY, _("Respect KDM validity periods"));
+		table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2));
+		++r;
+
 		_player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this));
+		_respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this));
 	}
 
 	void config_changed ()
@@ -112,6 +117,8 @@ private:
 			checked_set (_player_mode, 2);
 			break;
 		}
+
+		checked_set (_respect_kdm, Config::instance()->respect_kdm_validity_periods());
 	}
 
 private:
@@ -130,7 +137,13 @@ private:
 		}
 	}
 
+	void respect_kdm_changed ()
+	{
+		Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue());
+	}
+
 	wxChoice* _player_mode;
+	wxCheckBox* _respect_kdm;
 };
 
 wxPreferencesEditor*