X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=8329f1d8655393df71e50d8dd8bc16d3ef38b86d;hb=39a7a8be0bdb499423f96aa23ed3bffdc7d6c912;hp=44c6b8606cbe57c9364bfcde8fae496dcdccfb55;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 44c6b8606..8329f1d86 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -18,14 +18,26 @@
 
 */
 
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
+#include "wx/about_dialog.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/film_viewer.h"
+#include "wx/player_information.h"
+#include "wx/update_dialog.h"
+#include "wx/player_config_dialog.h"
+#include "wx/verify_dcp_dialog.h"
+#include "wx/controls.h"
 #include "lib/cross.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/internet.h"
 #include "lib/update_checker.h"
 #include "lib/compose.hpp"
 #include "lib/dcp_content.h"
 #include "lib/job_manager.h"
 #include "lib/job.h"
+#include "lib/film.h"
 #include "lib/video_content.h"
 #include "lib/text_content.h"
 #include "lib/ratio.h"
@@ -34,21 +46,14 @@
 #include "lib/examine_content_job.h"
 #include "lib/server.h"
 #include "lib/dcpomatic_socket.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/wx_util.h"
-#include "wx/about_dialog.h"
-#include "wx/report_problem_dialog.h"
-#include "wx/film_viewer.h"
-#include "wx/player_information.h"
-#include "wx/update_dialog.h"
-#include "wx/player_config_dialog.h"
-#include "wx/verify_dcp_dialog.h"
+#include "lib/scoped_temporary.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/splash.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/progdlg.h>
+#include <wx/display.h>
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -82,7 +87,9 @@ enum {
 	ID_file_close = 100,
 	ID_view_cpl,
 	/* Allow spare IDs for CPLs */
-	ID_view_closed_captions = 200,
+	ID_view_full_screen = 200,
+	ID_view_dual_screen,
+	ID_view_closed_captions,
 	ID_view_scale_appropriate,
 	ID_view_scale_full,
 	ID_view_scale_half,
@@ -101,14 +108,17 @@ class DOMFrame : public wxFrame
 public:
 	DOMFrame ()
 		: wxFrame (0, -1, _("DCP-o-matic Player"))
+		, _dual_screen (0)
 		, _update_news_requested (false)
 		, _info (0)
+		, _mode (Config::instance()->player_mode())
 		, _config_dialog (0)
 		, _file_menu (0)
 		, _history_items (0)
 		, _history_position (0)
 		, _history_separator (0)
-		, _viewer (0)
+		, _view_full_screen (0)
+		, _view_dual_screen (0)
 	{
 
 #if defined(DCPOMATIC_WINDOWS)
@@ -135,6 +145,8 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_full_screen, this), ID_view_full_screen);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_dual_screen, this), ID_view_dual_screen);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this), ID_view_closed_captions);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_cpl, this, _1), ID_view_cpl, ID_view_cpl + MAX_CPLS);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional<int>(0)), ID_view_scale_full);
@@ -148,16 +160,17 @@ public:
 		/* Use a panel as the only child of the Frame so that we avoid
 		   the dark-grey background on Windows.
 		*/
-		wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
+		_overall_panel = new wxPanel (this, wxID_ANY);
 
-		_viewer = new FilmViewer (overall_panel, false, false);
+		_viewer.reset (new FilmViewer (_overall_panel));
+		_controls = new Controls (_overall_panel, _viewer, false);
 		_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
-		_info = new PlayerInformation (overall_panel, _viewer);
-		wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
-		main_sizer->Add (_viewer, 1, wxEXPAND | wxALL, 6);
-		main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6);
-		overall_panel->SetSizer (main_sizer);
-
+		_viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
+		_viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1));
+		_viewer->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1));
+		_viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1));
+		_info = new PlayerInformation (_overall_panel, _viewer);
+		setup_main_sizer (true);
 #ifdef __WXOSX__
 		int accelerators = 4;
 #else
@@ -180,6 +193,97 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
 
 		UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+		_controls->DCPDirectorySelected.connect (boost::bind(&DOMFrame::load_dcp, this, _1));
+		_controls->DCPEjected.connect (boost::bind(&DOMFrame::eject_dcp, this));
+
+		setup_screen ();
+	}
+
+	void setup_main_sizer (bool with_viewer)
+	{
+		wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
+		if (with_viewer) {
+			main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+		}
+		main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
+		main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6);
+		_overall_panel->SetSizer (main_sizer);
+		_overall_panel->Layout ();
+	}
+
+	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 playback_started (DCPTime time)
+	{
+		optional<boost::filesystem::path> log = Config::instance()->player_log_file();
+		if (!log) {
+			return;
+		}
+
+		shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+		DCPOMATIC_ASSERT (dcp);
+		DCPExaminer ex (dcp);
+		shared_ptr<dcp::CPL> playing_cpl;
+		BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+			if (!dcp->cpl() || i->id() == *dcp->cpl()) {
+				playing_cpl = i;
+			}
+		}
+		DCPOMATIC_ASSERT (playing_cpl)
+
+		FILE* f = fopen_boost(*log, "a");
+		fprintf (
+			f,
+			"%s playback-started %s %s %s\n",
+			dcp::LocalTime().as_string().c_str(),
+			time.timecode(_film->video_frame_rate()).c_str(),
+			dcp->directories().front().string().c_str(),
+			playing_cpl->annotation_text().c_str()
+			);
+		fclose (f);
+	}
+
+	void playback_seeked (DCPTime time)
+	{
+		optional<boost::filesystem::path> log = Config::instance()->player_log_file();
+		if (!log) {
+			return;
+		}
+
+		FILE* f = fopen_boost(*log, "a");
+		fprintf (f, "%s playback-seeked %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str());
+		fclose (f);
+	}
+
+	void playback_stopped (DCPTime time)
+	{
+		optional<boost::filesystem::path> log = Config::instance()->player_log_file();
+		if (!log) {
+			return;
+		}
+
+		FILE* f = fopen_boost(*log, "a");
+		fprintf (f, "%s playback-stopped %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str());
+		fclose (f);
 	}
 
 	void set_decode_reduction (optional<int> reduction)
@@ -189,6 +293,13 @@ public:
 		Config::instance()->set_decode_reduction (reduction);
 	}
 
+	void eject_dcp ()
+	{
+		_film.reset (new Film (optional<boost::filesystem::path>()));
+		_viewer->set_film (_film);
+		_info->triggered_update ();
+	}
+
 	void load_dcp (boost::filesystem::path dir)
 	{
 		_film.reset (new Film (optional<boost::filesystem::path>()));
@@ -206,6 +317,50 @@ public:
 			return;
 		}
 
+		/* The DCP has been examined and loaded */
+
+		optional<boost::filesystem::path> kdm_dir = Config::instance()->player_kdm_directory();
+		if (dcp->needs_kdm() && kdm_dir) {
+			/* Look for a KDM */
+
+			optional<dcp::EncryptedKDM> kdm;
+
+			ScopedTemporary temp;
+			string url = Config::instance()->kdm_server_url();
+			boost::algorithm::replace_all (url, "{CPL}", "%1");
+			if (dcp->cpl() && !get_from_url(String::compose(url, *dcp->cpl()), false, temp)) {
+				try {
+					kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
+					if (kdm->cpl_id() != dcp->cpl()) {
+						kdm = boost::none;
+					}
+				} catch (std::exception& e) {
+					/* Hey well */
+				}
+			}
+
+			if (!kdm) {
+				using namespace boost::filesystem;
+				for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
+					if (file_size(i->path()) < MAX_KDM_SIZE) {
+						try {
+							kdm = dcp::EncryptedKDM(dcp::file_to_string(i->path()));
+							if (kdm->cpl_id() == dcp->cpl()) {
+								break;
+							}
+						} catch (std::exception& e) {
+							/* Hey well */
+						}
+					}
+				}
+			}
+
+			if (kdm) {
+				dcp->add_kdm (*kdm);
+				dcp->examine (shared_ptr<Job>());
+			}
+		}
+
 		setup_from_dcp (dcp);
 
 		if (dcp->three_d()) {
@@ -213,7 +368,7 @@ public:
 		}
 
 		_viewer->set_film (_film);
-		_viewer->set_position (DCPTime ());
+		_viewer->seek (DCPTime(), true);
 		_info->triggered_update ();
 
 		Config::instance()->add_to_player_history (dir);
@@ -228,12 +383,15 @@ public:
 		DCPExaminer ex (dcp);
 		int id = ID_view_cpl;
 		BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
-			wxMenuItem* j = _cpl_menu->AppendRadioItem(id, i->id());
-			if (!dcp->cpl() || i->id() == *dcp->cpl()) {
-				j->Check(true);
-			}
+			wxMenuItem* j = _cpl_menu->AppendRadioItem(
+				id,
+				wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
+				);
+			j->Check(!dcp->cpl() || i->id() == *dcp->cpl());
 			++id;
 		}
+
+		_controls->log (wxString::Format(_("Load DCP %s"), dir.filename().string().c_str()));
 	}
 
 private:
@@ -269,6 +427,13 @@ private:
 		wxMenu* view = new wxMenu;
 		optional<int> c = Config::instance()->decode_reduction();
 		_view_cpl = view->Append(ID_view_cpl, _("CPL"), _cpl_menu);
+		view->AppendSeparator();
+#ifndef DCPOMATIC_VARIANT_SWAROOP
+		_view_full_screen = view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11"));
+		_view_dual_screen = view->AppendCheckItem(ID_view_dual_screen, _("Dual screen\tShift+F11"));
+#endif
+		setup_menu ();
+		view->AppendSeparator();
 		view->Append(ID_view_closed_captions, _("Closed captions..."));
 		view->AppendSeparator();
 		view->AppendRadioItem(ID_view_scale_appropriate, _("Set decode resolution to match display"))->Check(!static_cast<bool>(c));
@@ -433,6 +598,76 @@ private:
 		dcp->examine (shared_ptr<Job>());
 	}
 
+	void view_full_screen ()
+	{
+		if (_mode == Config::PLAYER_MODE_FULL) {
+			_mode = Config::PLAYER_MODE_WINDOW;
+		} else {
+			_mode = Config::PLAYER_MODE_FULL;
+		}
+		setup_screen ();
+		setup_menu ();
+	}
+
+	void view_dual_screen ()
+	{
+		if (_mode == Config::PLAYER_MODE_DUAL) {
+			_mode = Config::PLAYER_MODE_WINDOW;
+		} else {
+			_mode = Config::PLAYER_MODE_DUAL;
+		}
+		setup_screen ();
+		setup_menu ();
+	}
+
+	void setup_menu ()
+	{
+		if (_view_full_screen) {
+			_view_full_screen->Check (_mode == Config::PLAYER_MODE_FULL);
+		}
+		if (_view_dual_screen) {
+			_view_dual_screen->Check (_mode == Config::PLAYER_MODE_DUAL);
+		}
+	}
+
+	void setup_screen ()
+	{
+		_controls->Show (_mode != Config::PLAYER_MODE_FULL);
+		_controls->show_extended_player_controls (_mode == Config::PLAYER_MODE_DUAL);
+		_info->Show (_mode != Config::PLAYER_MODE_FULL);
+		_overall_panel->SetBackgroundColour (_mode == Config::PLAYER_MODE_FULL ? wxColour(0, 0, 0) : wxNullColour);
+		ShowFullScreen (_mode == Config::PLAYER_MODE_FULL);
+
+		if (_mode == Config::PLAYER_MODE_DUAL) {
+			_dual_screen = new wxFrame (this, wxID_ANY, wxT(""));
+			_dual_screen->SetBackgroundColour (wxColour(0, 0, 0));
+			_dual_screen->ShowFullScreen (true);
+			_viewer->panel()->Reparent (_dual_screen);
+			_dual_screen->Show ();
+			if (wxDisplay::GetCount() > 1) {
+				switch (Config::instance()->image_display()) {
+				case 0:
+					_dual_screen->Move (0, 0);
+					Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+					break;
+				case 1:
+					_dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+					// (0, 0) doesn't seem to work for some strange reason
+					Move (8, 8);
+					break;
+				}
+			}
+		} else {
+			if (_dual_screen) {
+				_viewer->panel()->Reparent (_overall_panel);
+				_dual_screen->Destroy ();
+				_dual_screen = 0;
+			}
+		}
+
+		setup_main_sizer (_mode != Config::PLAYER_MODE_DUAL);
+	}
+
 	void view_closed_captions ()
 	{
 		_viewer->show_closed_captions ();
@@ -574,12 +809,12 @@ private:
 
 	void back_frame ()
 	{
-		_viewer->back_frame ();
+		_viewer->seek_by (-_viewer->one_video_frame(), true);
 	}
 
 	void forward_frame ()
 	{
-		_viewer->forward_frame ();
+		_viewer->seek_by (_viewer->one_video_frame(), true);
 	}
 
 private:
@@ -626,7 +861,7 @@ private:
 
 	void setup_from_dcp (shared_ptr<DCPContent> dcp)
 	{
-		BOOST_FOREACH (shared_ptr<TextContent> i, dcp->caption) {
+		BOOST_FOREACH (shared_ptr<TextContent> i, dcp->text) {
 			i->set_use (true);
 		}
 
@@ -638,21 +873,27 @@ private:
 		}
 	}
 
+	wxFrame* _dual_screen;
 	bool _update_news_requested;
 	PlayerInformation* _info;
+	Config::PlayerMode _mode;
 	wxPreferencesEditor* _config_dialog;
+	wxPanel* _overall_panel;
 	wxMenu* _file_menu;
 	wxMenuItem* _view_cpl;
 	wxMenu* _cpl_menu;
 	int _history_items;
 	int _history_position;
 	wxMenuItem* _history_separator;
-	FilmViewer* _viewer;
+	shared_ptr<FilmViewer> _viewer;
+	Controls* _controls;
 	boost::shared_ptr<Film> _film;
 	boost::signals2::scoped_connection _config_changed_connection;
 	wxMenuItem* _file_add_ov;
 	wxMenuItem* _file_add_kdm;
 	wxMenuItem* _tools_verify;
+	wxMenuItem* _view_full_screen;
+	wxMenuItem* _view_dual_screen;
 };
 
 static const wxCmdLineEntryDesc command_line_description[] = {