#include "wx/player_config_dialog.h"
#include "wx/verify_dcp_dialog.h"
#include "wx/controls.h"
-#include "wx/cinema_player_dialog.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/spl.h"
+#include "lib/spl_entry.h"
#include "lib/job.h"
#include "lib/film.h"
#include "lib/video_content.h"
#include "lib/examine_content_job.h"
#include "lib/server.h"
#include "lib/dcpomatic_socket.h"
+#include "lib/scoped_temporary.h"
+#include "lib/monitor_checker.h"
+#include <dcp/dcp.h>
+#include <dcp/raw_convert.h>
#include <wx/wx.h>
#include <wx/stdpaths.h>
#include <wx/splash.h>
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)
- , _cinema_dialog (0)
, _file_menu (0)
, _history_items (0)
, _history_position (0)
, _history_separator (0)
+ , _view_full_screen (0)
+ , _view_dual_screen (0)
{
#if defined(DCPOMATIC_WINDOWS)
SetIcon (wxIcon (std_to_wx ("id")));
#endif
- _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this));
- config_changed ();
+ _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+ update_from_config ();
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this), ID_file_open);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_ov, this), ID_file_add_ov);
_overall_panel = new wxPanel (this, wxID_ANY);
_viewer.reset (new FilmViewer (_overall_panel));
- _controls = new Controls (_overall_panel, _viewer);
+ _controls = new Controls (_overall_panel, _viewer, false);
_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
_viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
- _viewer->Started.connect (bind(&DOMFrame::playback_started, this));
- _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, 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));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this));
+#endif
_info = new PlayerInformation (_overall_panel, _viewer);
- wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
- 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);
-
+ setup_main_sizer (Config::instance()->player_mode());
#ifdef __WXOSX__
int accelerators = 4;
#else
Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
- _cinema_dialog = new CinemaPlayerDialog (this, _viewer);
- _cinema_dialog->Bind (wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this));
-
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
-
+ _controls->SPLChanged.connect (boost::bind(&DOMFrame::set_spl, this, _1));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ MonitorChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::monitor_checker_state_changed, this));
+ MonitorChecker::instance()->run ();
+#endif
setup_screen ();
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (
+ boost::filesystem::is_regular_file(Config::path("position")) &&
+ boost::filesystem::is_regular_file(Config::path("spl.xml"))) {
+
+ set_spl (SPL(Config::path("spl.xml")));
+ FILE* f = fopen_boost (Config::path("position"), "r");
+ if (f) {
+ char buffer[64];
+ fscanf (f, "%63s", buffer);
+ _viewer->seek (DCPTime(atoi(buffer)), true);
+ _viewer->start ();
+ fclose (f);
+ }
+ }
+
+#endif
}
- void close ()
+ void position_changed ()
{
- Close ();
+ if (!_viewer->playing() || _viewer->position().get() % DCPTime::HZ) {
+ return;
+ }
+
+ FILE* f = fopen_boost (Config::path("position"), "w");
+ if (f) {
+ string const p = dcp::raw_convert<string> (_viewer->position().get());
+ fwrite (p.c_str(), p.length(), 1, f);
+ fclose (f);
+ }
+ }
+
+ void monitor_checker_state_changed ()
+ {
+ if (!MonitorChecker::instance()->ok()) {
+ error_dialog (this, _("The required display devices are not connected correctly."));
+ _viewer->stop ();
+ }
+ }
+
+ void setup_main_sizer (Config::PlayerMode mode)
+ {
+ wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
+ if (mode != Config::PLAYER_MODE_DUAL) {
+ main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+ }
+ main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6);
+ main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6);
+ _overall_panel->SetSizer (main_sizer);
+ _overall_panel->Layout ();
}
bool playback_permitted ()
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (!MonitorChecker::instance()->ok()) {
+ error_dialog (this, _("The required display devices are not connected correctly."));
+ return false;
+ }
+#endif
if (!_film || !Config::instance()->respect_kdm_validity_periods()) {
return true;
}
return ok;
}
- void playback_started ()
+ void playback_started (DCPTime time)
{
optional<boost::filesystem::path> log = Config::instance()->player_log_file();
if (!log) {
FILE* f = fopen_boost(*log, "a");
fprintf (
f,
- "%s playback-started %s %s\n",
+ "%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_stopped ()
+ void playback_seeked (DCPTime time)
{
optional<boost::filesystem::path> log = Config::instance()->player_log_file();
if (!log) {
}
FILE* f = fopen_boost(*log, "a");
- fprintf (f, "%s playback-stopped\n", dcp::LocalTime().as_string().c_str());
+ 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)
+ {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ try {
+ boost::filesystem::remove (Config::path("position"));
+ } catch (...) {
+ /* Never mind */
+ }
+#endif
+
+ 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);
}
{
_viewer->set_dcp_decode_reduction (reduction);
_info->triggered_update ();
- _cinema_dialog->triggered_update ();
Config::instance()->set_decode_reduction (reduction);
}
void load_dcp (boost::filesystem::path dir)
{
- _film.reset (new Film (optional<boost::filesystem::path>()));
- shared_ptr<DCPContent> dcp;
- try {
- dcp.reset (new DCPContent (_film, dir));
- } catch (boost::filesystem::filesystem_error& e) {
- error_dialog (this, _("Could not load DCP"), std_to_wx (e.what()));
- return;
+ dcp::DCP dcp (dir);
+ dcp.read ();
+ SPL spl;
+ BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
+ spl.playlist.push_back (SPLEntry(j, dir));
}
+ set_spl (spl);
+ Config::instance()->add_to_player_history (dir);
+ }
- _film->examine_and_add_content (dcp, true);
- bool const ok = progress (_("Loading DCP"));
- if (!ok || !report_errors_from_last_job()) {
- return;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ optional<dcp::EncryptedKDM> get_kdm_from_url (shared_ptr<DCPContent> dcp)
+ {
+ ScopedTemporary temp;
+ string url = Config::instance()->kdm_server_url();
+ boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl());
+ optional<dcp::EncryptedKDM> kdm;
+ if (dcp->cpl() && !get_from_url(url, 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 */
+ }
+ }
+ return kdm;
+ }
+#endif
+
+ optional<dcp::EncryptedKDM> get_kdm_from_directory (shared_ptr<DCPContent> dcp)
+ {
+ using namespace boost::filesystem;
+ optional<path> kdm_dir = Config::instance()->player_kdm_directory();
+ if (!kdm_dir) {
+ return optional<dcp::EncryptedKDM>();
+ }
+ for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
+ try {
+ if (file_size(i->path()) < MAX_KDM_SIZE) {
+ dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
+ if (kdm.cpl_id() == dcp->cpl()) {
+ return kdm;
+ }
+ }
+ } catch (std::exception& e) {
+ /* Hey well */
+ }
}
+ return optional<dcp::EncryptedKDM>();
+ }
- setup_from_dcp (dcp);
+ void set_spl (SPL spl)
+ {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ spl.as_xml (Config::path("spl.xml"));
+#endif
- if (dcp->three_d()) {
- _film->set_three_d (true);
+ if (_viewer->playing ()) {
+ _viewer->stop ();
}
- _viewer->set_film (_film);
- _viewer->seek (DCPTime(), true);
- _info->triggered_update ();
- _cinema_dialog->triggered_update ();
+ _film.reset (new Film (optional<boost::filesystem::path>()));
- Config::instance()->add_to_player_history (dir);
+ if (spl.playlist.empty ()) {
+ _viewer->set_film (_film);
+ _info->triggered_update ();
+ return;
+ }
- set_menu_sensitivity ();
+ /* Start off as Flat */
+ _film->set_container (Ratio::from_id("185"));
+
+ /* Put 1 frame of black at the start so when we seek to 0 we don't see anything */
+ DCPTime position = DCPTime::from_frames(1, _film->video_frame_rate());
+ shared_ptr<DCPContent> first;
+
+ BOOST_FOREACH (SPLEntry i, spl.playlist) {
+ shared_ptr<DCPContent> dcp;
+ try {
+ dcp.reset (new DCPContent (_film, i.directory));
+ } catch (boost::filesystem::filesystem_error& e) {
+ error_dialog (this, _("Could not load DCP"), std_to_wx (e.what()));
+ return;
+ }
+
+ if (!first) {
+ first = dcp;
+ }
+
+ _film->examine_and_add_content (dcp, true);
+ bool const ok = progress (_("Loading DCP"));
+ if (!ok || !report_errors_from_last_job()) {
+ return;
+ }
+
+ dcp->set_position (position + i.black_before);
+ position += dcp->length_after_trim() + i.black_before;
+
+ /* This DCP has been examined and loaded */
+
+ if (dcp->needs_kdm()) {
+ optional<dcp::EncryptedKDM> kdm;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ kdm = get_kdm_from_url (dcp);
+#endif
+ if (!kdm) {
+ get_kdm_from_directory (dcp);
+ }
+
+ if (kdm) {
+ dcp->add_kdm (*kdm);
+ dcp->examine (shared_ptr<Job>());
+ }
+ }
+
+ BOOST_FOREACH (shared_ptr<TextContent> j, dcp->text) {
+ j->set_use (true);
+ }
+
+ if (dcp->video) {
+ Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
+ if (r->id() == "239") {
+ /* Any scope content means we use scope */
+ _film->set_container(r);
+ }
+ }
+
+ /* Any 3D content means we use 3D mode */
+ if (dcp->three_d()) {
+ _film->set_three_d (true);
+ }
+
+ _viewer->set_film (_film);
+ _viewer->seek (DCPTime(), true);
+ _info->triggered_update ();
+
+ set_menu_sensitivity ();
+ _controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str()));
+ }
wxMenuItemList old = _cpl_menu->GetMenuItems();
for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
_cpl_menu->Remove (*i);
}
- DCPExaminer ex (dcp);
- int id = ID_view_cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
- 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;
+ if (spl.playlist.size() == 1) {
+ /* Offer a CPL menu */
+ DCPExaminer ex (first);
+ int id = ID_view_cpl;
+ BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+ 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(!first->cpl() || i->id() == *first->cpl());
+ ++id;
+ }
}
}
#endif
#ifdef __WXOSX__
- _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+ wxMenuItem* prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
#else
wxMenu* edit = new wxMenu;
- edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+ wxMenuItem* prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
#endif
+ prefs->Enable (Config::instance()->have_write_permission());
+
_cpl_menu = new wxMenu;
wxMenu* view = new wxMenu;
optional<int> c = Config::instance()->decode_reduction();
_view_cpl = view->Append(ID_view_cpl, _("CPL"), _cpl_menu);
view->AppendSeparator();
- view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11"))->Check(_mode == Config::PLAYER_MODE_FULL);
- view->AppendCheckItem(ID_view_dual_screen, _("Dual screen\tShift+F11"))->Check(_mode == Config::PLAYER_MODE_DUAL);
+#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();
if (!ok || !report_errors_from_last_job()) {
return;
}
- setup_from_dcp (dcp);
+ BOOST_FOREACH (shared_ptr<TextContent> i, dcp->text) {
+ i->set_use (true);
+ }
+ if (dcp->video) {
+ Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
+ if (r) {
+ _film->set_container(r);
+ }
+ }
}
c->Destroy ();
_info->triggered_update ();
- _cinema_dialog->triggered_update ();
}
void file_add_kdm ()
d->Destroy ();
_info->triggered_update ();
- _cinema_dialog->triggered_update ();
}
void file_history (wxCommandEvent& event)
_viewer->set_film (shared_ptr<Film>());
_film.reset ();
_info->triggered_update ();
- _cinema_dialog->triggered_update ();
set_menu_sensitivity ();
}
void edit_preferences ()
{
+ if (!Config::instance()->have_write_permission()) {
+ return;
+ }
+
if (!_config_dialog) {
_config_dialog = create_player_config_dialog ();
}
_mode = Config::PLAYER_MODE_FULL;
}
setup_screen ();
+ setup_menu ();
}
void view_dual_screen ()
_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_WINDOW);
- _info->Show (_mode == Config::PLAYER_MODE_WINDOW);
- _overall_panel->SetBackgroundColour (_mode == Config::PLAYER_MODE_WINDOW ? wxNullColour : wxColour(0, 0, 0));
- ShowFullScreen (_mode != Config::PLAYER_MODE_WINDOW);
+ _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) {
- _cinema_dialog->Show ();
+ _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) {
- this->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
- /* (0, 0) doesn't seem to work for some strange reason */
- _cinema_dialog->Move (8, 8);
+ 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);
}
void view_closed_captions ()
_update_news_requested = false;
}
- void config_changed ()
+ void config_changed (Config::Property prop)
{
/* Instantly save any config changes when using the player GUI */
try {
Config::instance()->write_config();
+ } catch (FileError& e) {
+ if (prop != Config::HISTORY) {
+ error_dialog (
+ this,
+ wxString::Format(
+ _("Could not write to config file at %s. Your changes have not been saved."),
+ std_to_wx(e.file().string())
+ )
+ );
+ }
} catch (exception& e) {
error_dialog (
this,
- wxString::Format (
- _("Could not write to config file at %s. Your changes have not been saved."),
- std_to_wx (Config::instance()->cinemas_file().string()).data()
- )
+ _("Could not write to config file. Your changes have not been saved.")
);
}
+ update_from_config ();
+ }
+
+ void update_from_config ()
+ {
for (int i = 0; i < _history_items; ++i) {
delete _file_menu->Remove (ID_file_history + i);
}
return true;
}
- void setup_from_dcp (shared_ptr<DCPContent> dcp)
- {
- BOOST_FOREACH (shared_ptr<TextContent> i, dcp->text) {
- i->set_use (true);
- }
-
- if (dcp->video) {
- Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
- if (r) {
- _film->set_container(r);
- }
- }
- }
-
+ wxFrame* _dual_screen;
bool _update_news_requested;
PlayerInformation* _info;
Config::PlayerMode _mode;
wxPreferencesEditor* _config_dialog;
- CinemaPlayerDialog* _cinema_dialog;
wxPanel* _overall_panel;
wxMenu* _file_menu;
wxMenuItem* _view_cpl;
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[] = {
*/
Config::drop ();
+ signal_manager = new wxSignalManager (this);
+
_frame = new DOMFrame ();
SetTopWindow (_frame);
_frame->Maximize ();
}
_frame->Show ();
- signal_manager = new wxSignalManager (this);
-
PlayServer* server = new PlayServer (_frame);
new thread (boost::bind (&PlayServer::run, server));