#include "lib/server.h"
#include "lib/dcpomatic_socket.h"
#include "lib/scoped_temporary.h"
+#include "lib/monitor_checker.h"
+#include <dcp/dcp.h>
#include <wx/wx.h>
#include <wx/stdpaths.h>
#include <wx/splash.h>
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);
_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);
+ setup_main_sizer (Config::instance()->player_mode());
#ifdef __WXOSX__
int accelerators = 4;
#else
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));
-
+ _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 ();
}
- void setup_main_sizer (bool with_viewer)
+ 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 (with_viewer) {
+ if (mode != Config::PLAYER_MODE_DUAL) {
main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
}
- main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
+ 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;
}
Config::instance()->set_decode_reduction (reduction);
}
- void eject_dcp ()
+ void load_dcp (boost::filesystem::path dir)
{
- _film.reset (new Film (optional<boost::filesystem::path>()));
- _viewer->set_film (_film);
- _info->triggered_update ();
+ dcp::DCP dcp (dir);
+ dcp.read ();
+ list<SPLEntry> spl;
+ BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
+ spl.push_back (SPLEntry(j, dir));
+ }
+ set_spl (spl);
+ Config::instance()->add_to_player_history (dir);
}
- void load_dcp (boost::filesystem::path dir)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ optional<dcp::EncryptedKDM> get_kdm_from_url (shared_ptr<DCPContent> dcp)
{
- _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;
+ 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
- _film->examine_and_add_content (dcp, true);
- bool const ok = progress (_("Loading DCP"));
- if (!ok || !report_errors_from_last_job()) {
+ 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>();
+ }
+
+ void set_spl (list<SPLEntry> spl)
+ {
+ if (_viewer->playing ()) {
+ _viewer->stop ();
+ }
+
+ _film.reset (new Film (optional<boost::filesystem::path>()));
+
+ if (spl.empty ()) {
+ _viewer->set_film (_film);
+ _info->triggered_update ();
return;
}
- /* The DCP has been examined and loaded */
+ /* Start off as Flat */
+ _film->set_container (Ratio::from_id("185"));
- optional<boost::filesystem::path> kdm_dir = Config::instance()->player_kdm_directory();
- if (dcp->needs_kdm() && kdm_dir) {
- /* Look for a KDM */
+ /* 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;
- optional<dcp::EncryptedKDM> kdm;
+ BOOST_FOREACH (SPLEntry i, spl) {
+ 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;
+ }
- 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 (!first) {
+ first = dcp;
}
- 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 */
- }
- }
- }
+ _film->examine_and_add_content (dcp, true);
+ bool const ok = progress (_("Loading DCP"));
+ if (!ok || !report_errors_from_last_job()) {
+ return;
}
- if (kdm) {
- dcp->add_kdm (*kdm);
- dcp->examine (shared_ptr<Job>());
+ 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>());
+ }
}
- }
- setup_from_dcp (dcp);
+ BOOST_FOREACH (shared_ptr<TextContent> j, dcp->text) {
+ j->set_use (true);
+ }
- if (dcp->three_d()) {
- _film->set_three_d (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);
+ }
+ }
- _viewer->set_film (_film);
- _viewer->seek (DCPTime(), true);
- _info->triggered_update ();
+ /* Any 3D content means we use 3D mode */
+ if (dcp->three_d()) {
+ _film->set_three_d (true);
+ }
- Config::instance()->add_to_player_history (dir);
+ _viewer->set_film (_film);
+ _viewer->seek (DCPTime(), true);
+ _info->triggered_update ();
- set_menu_sensitivity ();
+ 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.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;
+ }
}
-
- _controls->log (wxString::Format(_("Load DCP %s"), dir.filename().string().c_str()));
}
private:
#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;
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 ();
void edit_preferences ()
{
+ if (!Config::instance()->have_write_permission()) {
+ return;
+ }
+
if (!_config_dialog) {
_config_dialog = create_player_config_dialog ();
}
}
}
- setup_main_sizer (_mode != Config::PLAYER_MODE_DUAL);
+ 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;
projects / dcpomatic.git / blobdiff