*/
-
#include "wx/wx_signal_manager.h"
#include "wx/wx_util.h"
#include "wx/about_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/job.h"
#include "lib/film.h"
+#include "lib/null_log.h"
#include "lib/video_content.h"
#include "lib/text_content.h"
#include "lib/ratio.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 "lib/lock_file_checker.h"
+#include "lib/ffmpeg_content.h"
+#include <dcp/dcp.h>
+#include <dcp/raw_convert.h>
+#include <dcp/exceptions.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
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,
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)
+ , _view_full_screen (0)
+ , _view_dual_screen (0)
{
+ /* XXX */
+ dcpomatic_log.reset (new NullLog());
+ cout << "here's the log " << dcpomatic_log.get() << "\n";
#if defined(DCPOMATIC_WINDOWS)
maybe_open_console ();
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);
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);
/* 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.reset (new FilmViewer (overall_panel));
- _controls = new Controls (overall_panel, _viewer);
+ _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->panel(), 1, wxEXPAND | wxALL, 6);
- main_sizer->Add (_controls, 0, 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));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this));
+#endif
+ _info = new PlayerInformation (_overall_panel, _viewer);
+ 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);
+ reset_film ();
+
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ MonitorChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::monitor_checker_state_changed, this));
+ MonitorChecker::instance()->run ();
+ LockFileChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::lock_checker_state_changed, this));
+ LockFileChecker::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"))) {
+
+ shared_ptr<Film> film (new Film(boost::optional<boost::filesystem::path>()));
+ film->read_metadata (Config::path("spl.xml"));
+ reset_film (film);
+ 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 position_changed ()
+ {
+ 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);
+ }
+ }
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ void monitor_checker_state_changed ()
+ {
+ if (!MonitorChecker::instance()->ok()) {
+ _viewer->stop ();
+ error_dialog (this, _("The required display devices are not connected correctly."));
+ }
+ }
+
+ void lock_checker_state_changed ()
+ {
+ if (!LockFileChecker::instance()->ok()) {
+ _viewer->stop ();
+ error_dialog (this, _("The lock file is not present."));
+ }
+ }
+#endif
+
+ 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;
+ }
+ if (!LockFileChecker::instance()->ok()) {
+ error_dialog (this, _("The lock file is not present."));
+ return false;
+ }
+#endif
+ 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;
+ }
+
+ FILE* f = fopen_boost(*log, "a");
+
+ /* XXX: this only logs the first piece of content; probably should be each piece? */
+
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_film->content().front());
+ if (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);
+
+ 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()
+ );
+ }
+
+ shared_ptr<FFmpegContent> ffmpeg = dynamic_pointer_cast<FFmpegContent>(_film->content().front());
+ if (ffmpeg) {
+ fprintf (
+ f,
+ "%s playback-started %s %s\n",
+ dcp::LocalTime().as_string().c_str(),
+ time.timecode(_film->video_frame_rate()).c_str(),
+ ffmpeg->path(0).string().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)
+ {
+#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);
}
void set_decode_reduction (optional<int> reduction)
void load_dcp (boost::filesystem::path dir)
{
- _film.reset (new Film (optional<boost::filesystem::path>()));
- shared_ptr<DCPContent> dcp;
+ DCPOMATIC_ASSERT (_film);
+
+ reset_film ();
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;
+ shared_ptr<DCPContent> dcp (new DCPContent(dir));
+ _film->examine_and_add_content (dcp);
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content"));
+ if (!ok || !report_errors_from_last_job(this)) {
+ return;
+ }
+ Config::instance()->add_to_player_history (dir);
+ } catch (dcp::DCPReadError& e) {
+ error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
+ }
+ }
+
+#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>();
+ }
- _film->examine_and_add_content (dcp, true);
- bool const ok = progress (_("Loading DCP"));
- if (!ok || !report_errors_from_last_job()) {
+ void reset_film (shared_ptr<Film> film = shared_ptr<Film>(new Film(optional<boost::filesystem::path>())))
+ {
+ _film = film;
+ _viewer->set_film (_film);
+ _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2));
+ }
+
+ void film_changed (ChangeType type, Film::Property property)
+ {
+ if (type != CHANGE_TYPE_DONE || property != Film::CONTENT) {
return;
}
- setup_from_dcp (dcp);
+ _film->write_metadata (Config::path("spl.xml"));
- if (dcp->three_d()) {
- _film->set_three_d (true);
+ if (_viewer->playing ()) {
+ _viewer->stop ();
+ }
+
+ /* Start off as Flat */
+ _film->set_container (Ratio::from_id("185"));
+
+ BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
+ if (dcp && dcp->needs_kdm()) {
+ optional<dcp::EncryptedKDM> kdm;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ kdm = get_kdm_from_url (dcp);
+#endif
+ if (!kdm) {
+ kdm = get_kdm_from_directory (dcp);
+ }
+
+ if (kdm) {
+ dcp->add_kdm (*kdm);
+ dcp->examine (_film, shared_ptr<Job>());
+ }
+ }
+
+ BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ j->set_use (true);
+ }
+
+ if (i->video) {
+ Ratio const * r = Ratio::nearest_from_ratio(i->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 (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) {
+ _film->set_three_d (true);
+ }
}
- _viewer->set_film (_film);
_viewer->seek (DCPTime(), true);
_info->triggered_update ();
- Config::instance()->add_to_player_history (dir);
-
set_menu_sensitivity ();
wxMenuItemList old = _cpl_menu->GetMenuItems();
_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 (_film->content().size() == 1) {
+ /* Offer a CPL menu */
+ shared_ptr<DCPContent> first = dynamic_pointer_cast<DCPContent>(_film->content().front());
+ if (first) {
+ 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();
+#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));
DCPOMATIC_ASSERT (dcp);
dcp->add_ov (wx_to_std(c->GetPath()));
JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob (_film, dcp)));
- bool const ok = progress (_("Loading DCP"));
- if (!ok || !report_errors_from_last_job()) {
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content"));
+ if (!ok || !report_errors_from_last_job(this)) {
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 ();
DCPOMATIC_ASSERT (dcp);
try {
dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
- dcp->examine (shared_ptr<Job>());
+ dcp->examine (_film, shared_ptr<Job>());
} catch (exception& e) {
error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
d->Destroy ();
void file_close ()
{
- _viewer->set_film (shared_ptr<Film>());
- _film.reset ();
+ reset_film ();
_info->triggered_update ();
set_menu_sensitivity ();
}
void edit_preferences ()
{
+ if (!Config::instance()->have_write_permission()) {
+ return;
+ }
+
if (!_config_dialog) {
_config_dialog = create_player_config_dialog ();
}
}
dcp->set_cpl ((*i)->id());
- dcp->examine (shared_ptr<Job>());
+ dcp->examine (_film, 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);
+ _viewer->set_pad_black (_mode != Config::PLAYER_MODE_WINDOW);
+
+ 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);
}
void view_closed_captions ()
JobManager* jm = JobManager::instance ();
jm->add (shared_ptr<Job> (new VerifyDCPJob (dcp->directories())));
- bool const ok = progress (_("Verifying DCP"));
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Verifying DCP"));
if (!ok) {
return;
}
_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);
}
private:
- /** @return false if the task was cancelled */
- bool progress (wxString task)
- {
- JobManager* jm = JobManager::instance ();
-
- wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), task, 100, 0, wxPD_CAN_ABORT);
-
- bool ok = true;
-
- while (jm->work_to_do() || signal_manager->ui_idle()) {
- dcpomatic_sleep (1);
- if (!progress->Pulse()) {
- /* user pressed cancel */
- BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
- i->cancel();
- }
- ok = false;
- break;
- }
- }
-
- progress->Destroy ();
- return ok;
- }
-
- bool report_errors_from_last_job ()
- {
- JobManager* jm = JobManager::instance ();
-
- DCPOMATIC_ASSERT (!jm->get().empty());
-
- shared_ptr<Job> last = jm->get().back();
- if (last->finished_in_error()) {
- error_dialog(this, std_to_wx(last->error_summary()) + ".\n", std_to_wx(last->error_details()));
- return false;
- }
-
- 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;
+ wxPanel* _overall_panel;
wxMenu* _file_menu;
wxMenuItem* _view_cpl;
wxMenu* _cpl_menu;
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));
projects / dcpomatic.git / blobdiff