*/
+#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/standard_controls.h"
+#include "wx/swaroop_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/null_log.h"
#include "lib/video_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
#include "lib/ratio.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 "lib/verify_dcp_job.h"
+#include "lib/dcp_examiner.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 "lib/dcpomatic_log.h"
+#include "lib/file_log.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
#undef check
#endif
+#define MAX_CPLS 32
+
using std::string;
using std::cout;
+using std::list;
using std::exception;
using std::vector;
using boost::shared_ptr;
+using boost::weak_ptr;
+using boost::scoped_array;
using boost::optional;
+using boost::dynamic_pointer_cast;
+using boost::thread;
+using boost::bind;
enum {
ID_file_open = 1,
ID_file_history,
/* Allow spare IDs after _history for the recent files list */
ID_file_close = 100,
+ ID_view_cpl,
+ /* Allow spare IDs for CPLs */
+ 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,
ID_view_scale_quarter,
ID_help_report_a_problem,
+ ID_tools_verify,
ID_tools_check_for_updates,
+ /* IDs for shortcuts (with no associated menu item) */
+ ID_start_stop,
+ ID_back_frame,
+ ID_forward_frame
};
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)
{
+ dcpomatic_log.reset (new NullLog());
#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 (Config::PLAYER_DEBUG_LOG);
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::set_decode_reduction, this, optional<int>()), ID_view_scale_appropriate);
+ 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);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional<int>(1)), ID_view_scale_half);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional<int>(2)), ID_view_scale_quarter);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_verify, this), ID_tools_verify);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates);
/* 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);
- _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.reset (new FilmViewer (_overall_panel));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ SwaroopControls* sc = new SwaroopControls (_overall_panel, _viewer);
+ _controls = sc;
+ sc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1));
+#else
+ _controls = new StandardControls (_overall_panel, _viewer, false);
+#endif
+ _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, _1));
+ _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1));
+ _info = new PlayerInformation (_overall_panel, _viewer);
+ setup_main_sizer (Config::instance()->player_mode());
+#ifdef __WXOSX__
+ int accelerators = 4;
+#else
+ int accelerators = 3;
+#endif
+ wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
+ accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
+ accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_back_frame);
+ accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame);
#ifdef __WXOSX__
- wxAcceleratorEntry* accel = new wxAcceleratorEntry[1];
- accel[0].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
- wxAcceleratorTable accel_table (1, accel);
+ accel[3].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
+#endif
+ wxAcceleratorTable accel_table (accelerators, accel);
SetAcceleratorTable (accel_table);
delete[] accel;
-#endif
+
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop);
+ 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
+ sc->check_restart ();
+#endif
+ }
+
+#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)
+ {
+ /* 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);
+
+ _controls->log (
+ wxString::Format(
+ "playback-started %s %s %s",
+ 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) {
+ _controls->log (
+ wxString::Format(
+ "playback-started %s %s",
+ time.timecode(_film->video_frame_rate()).c_str(),
+ ffmpeg->path(0).string().c_str()
+ )
+ );
+ }
+ }
+
+ void playback_stopped (DCPTime time)
+ {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ try {
+ boost::filesystem::remove (Config::path("position"));
+ } catch (...) {
+ /* Never mind */
+ }
+#endif
+
+ _controls->log (wxString::Format("playback-stopped %s", time.timecode(_film->video_frame_rate()).c_str()));
}
void set_decode_reduction (optional<int> reduction)
{
_viewer->set_dcp_decode_reduction (reduction);
_info->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;
+ 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, true);
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content"));
+ if (!ok || !report_errors_from_last_job(this)) {
+ return;
+ }
+#ifndef DCPOMATIC_VARIANT_SWAROOP
+ Config::instance()->add_to_player_history (dir);
+#endif
+ } 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()));
}
+ }
- _film->examine_and_add_content (dcp, true);
+ void reset_film_weak (weak_ptr<Film> weak_film)
+ {
+ shared_ptr<Film> film = weak_film.lock ();
+ if (film) {
+ reset_film (film);
+ }
+ }
- JobManager* jm = JobManager::instance ();
+ void reset_film (shared_ptr<Film> film = shared_ptr<Film>(new Film(optional<boost::filesystem::path>())))
+ {
+ _film = film;
+ _viewer->set_film (_film);
+ _controls->set_film (_film);
+ _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2));
+ _info->triggered_update ();
+ }
- wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), _("Loading DCP"));
+ void film_changed (ChangeType type, Film::Property property)
+ {
+ if (type != CHANGE_TYPE_DONE || property != Film::CONTENT) {
+ return;
+ }
- while (jm->work_to_do() || signal_manager->ui_idle()) {
- dcpomatic_sleep (1);
- progress->Pulse ();
+ if (_viewer->playing ()) {
+ _viewer->stop ();
}
- progress->Destroy ();
+ /* Start off as Flat */
+ _film->set_container (Ratio::from_id("185"));
- DCPOMATIC_ASSERT (!jm->get().empty());
+ BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
- shared_ptr<Job> last = jm->get().back();
- if (last->finished_in_error()) {
- error_dialog (this, std_to_wx (last->error_summary()) + ".\n");
- return;
- }
+ BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ j->set_use (true);
+ }
- if (dcp->subtitle) {
- dcp->subtitle->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);
+ }
+ }
- Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
- if (r) {
- _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->set_position (DCPTime ());
+ _viewer->seek (DCPTime(), true);
_info->triggered_update ();
- Config::instance()->add_to_player_history (dir);
-
set_menu_sensitivity ();
+
+ wxMenuItemList old = _cpl_menu->GetMenuItems();
+ for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
+ _cpl_menu->Remove (*i);
+ }
+
+ 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;
+ }
+ }
+ }
}
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;
- view->AppendRadioItem (ID_view_scale_appropriate, _("Set decode resolution to match display"));
- view->AppendRadioItem (ID_view_scale_full, _("Decode at full resolution"));
- view->AppendRadioItem (ID_view_scale_half, _("Decode at half resolution"));
- view->AppendRadioItem (ID_view_scale_quarter, _("Decode at quarter resolution"));
+ 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));
+ view->AppendRadioItem(ID_view_scale_full, _("Decode at full resolution"))->Check(c && c.get() == 0);
+ view->AppendRadioItem(ID_view_scale_half, _("Decode at half resolution"))->Check(c && c.get() == 1);
+ view->AppendRadioItem(ID_view_scale_quarter, _("Decode at quarter resolution"))->Check(c && c.get() == 2);
wxMenu* tools = new wxMenu;
+ _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP"));
+ tools->AppendSeparator ();
tools->Append (ID_tools_check_for_updates, _("Check for updates"));
wxMenu* help = new wxMenu;
shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
dcp->add_ov (wx_to_std(c->GetPath()));
- dcp->examine (shared_ptr<Job>());
+ JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob (_film, dcp)));
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content"));
+ if (!ok || !report_errors_from_last_job(this)) {
+ return;
+ }
+ 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 ();
}
_config_dialog->Show (this);
}
+ void view_cpl (wxCommandEvent& ev)
+ {
+ shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ DCPOMATIC_ASSERT (dcp);
+ DCPExaminer ex (dcp);
+ int id = ev.GetId() - ID_view_cpl;
+ DCPOMATIC_ASSERT (id >= 0);
+ DCPOMATIC_ASSERT (id < int(ex.cpls().size()));
+ list<shared_ptr<dcp::CPL> > cpls = ex.cpls();
+ list<shared_ptr<dcp::CPL> >::iterator i = cpls.begin();
+ while (id > 0) {
+ ++i;
+ --id;
+ }
+
+ dcp->set_cpl ((*i)->id());
+ 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);
+ _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 ()
+ {
+ _viewer->show_closed_captions ();
+ }
+
+ void tools_verify ()
+ {
+ shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ DCPOMATIC_ASSERT (dcp);
+
+ JobManager* jm = JobManager::instance ();
+ jm->add (shared_ptr<Job> (new VerifyDCPJob (dcp->directories())));
+ bool const ok = display_progress (_("DCP-o-matic Player"), _("Verifying DCP"));
+ if (!ok) {
+ return;
+ }
+
+ DCPOMATIC_ASSERT (!jm->get().empty());
+ shared_ptr<VerifyDCPJob> last = dynamic_pointer_cast<VerifyDCPJob> (jm->get().back());
+ DCPOMATIC_ASSERT (last);
+
+ VerifyDCPDialog* d = new VerifyDCPDialog (this, last);
+ d->ShowModal ();
+ d->Destroy ();
+ }
+
void tools_check_for_updates ()
{
UpdateChecker::instance()->run ();
_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 (prop);
+ }
+
+ void update_from_config (Config::Property prop)
+ {
for (int i = 0; i < _history_items; ++i) {
delete _file_menu->Remove (ID_file_history + i);
}
}
_history_items = history.size ();
+
+ if (prop == Config::PLAYER_DEBUG_LOG) {
+ optional<boost::filesystem::path> p = Config::instance()->player_debug_log_file();
+ if (p) {
+ dcpomatic_log.reset (new FileLog(*p));
+ } else {
+ dcpomatic_log.reset (new NullLog());
+ }
+ dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_PLAYER);
+ }
}
void set_menu_sensitivity ()
{
+ _tools_verify->Enable (static_cast<bool>(_film));
_file_add_ov->Enable (static_cast<bool>(_film));
_file_add_kdm->Enable (static_cast<bool>(_film));
+ _view_cpl->Enable (static_cast<bool>(_film));
+ }
+
+ void start_stop_pressed ()
+ {
+ if (_viewer->playing()) {
+ _viewer->stop();
+ } else {
+ _viewer->start();
+ }
+ }
+
+ void back_frame ()
+ {
+ _viewer->seek_by (-_viewer->one_video_frame(), true);
}
+ void forward_frame ()
+ {
+ _viewer->seek_by (_viewer->one_video_frame(), true);
+ }
+
+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[] = {
{ wxCMD_LINE_PARAM, 0, 0, "DCP to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_OPTION, "c", "config", "Directory containing config.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+class PlayServer : public Server
+{
+public:
+ explicit PlayServer (DOMFrame* frame)
+ : Server (PLAYER_PLAY_PORT)
+ , _frame (frame)
+ {}
+
+ void handle (shared_ptr<Socket> socket)
+ {
+ try {
+ int const length = socket->read_uint32 ();
+ scoped_array<char> buffer (new char[length]);
+ socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+ string s (buffer.get());
+ signal_manager->when_idle (bind (&DOMFrame::load_dcp, _frame, s));
+ socket->write (reinterpret_cast<uint8_t const *> ("OK"), 3);
+ } catch (...) {
+
+ }
+ }
+
+private:
+ DOMFrame* _frame;
+};
+
/** @class App
* @brief The magic App class for wxWidgets.
*/
private:
bool OnInit ()
- try
{
- wxInitAllImageHandlers ();
+ wxSplashScreen* splash = 0;
+ try {
+ wxInitAllImageHandlers ();
- Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
- Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+ Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
- wxSplashScreen* splash = maybe_show_splash ();
+ splash = maybe_show_splash ();
- SetAppName (_("DCP-o-matic Player"));
+ SetAppName (_("DCP-o-matic Player"));
- if (!wxApp::OnInit()) {
- return false;
- }
+ if (!wxApp::OnInit()) {
+ return false;
+ }
#ifdef DCPOMATIC_LINUX
- unsetenv ("UBUNTU_MENUPROXY");
+ unsetenv ("UBUNTU_MENUPROXY");
#endif
#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+ ProcessSerialNumber serial;
+ GetCurrentProcess (&serial);
+ TransformProcessType (&serial, kProcessTransformToForegroundApplication);
#endif
- dcpomatic_setup_path_encoding ();
-
- /* Enable i18n; this will create a Config object
- to look for a force-configured language. This Config
- object will be wrong, however, because dcpomatic_setup
- hasn't yet been called and there aren't any filters etc.
- set up yet.
- */
- dcpomatic_setup_i18n ();
-
- /* Set things up, including filters etc.
- which will now be internationalised correctly.
- */
- dcpomatic_setup ();
+ dcpomatic_setup_path_encoding ();
+
+ /* Enable i18n; this will create a Config object
+ to look for a force-configured language. This Config
+ object will be wrong, however, because dcpomatic_setup
+ hasn't yet been called and there aren't any filters etc.
+ set up yet.
+ */
+ dcpomatic_setup_i18n ();
+
+ /* Set things up, including filters etc.
+ which will now be internationalised correctly.
+ */
+ dcpomatic_setup ();
+
+ /* Force the configuration to be re-loaded correctly next
+ time it is needed.
+ */
+ Config::drop ();
+
+ signal_manager = new wxSignalManager (this);
+
+ _frame = new DOMFrame ();
+ SetTopWindow (_frame);
+ _frame->Maximize ();
+ if (splash) {
+ splash->Destroy ();
+ splash = 0;
+ }
+ _frame->Show ();
- /* Force the configuration to be re-loaded correctly next
- time it is needed.
- */
- Config::drop ();
+ PlayServer* server = new PlayServer (_frame);
+ new thread (boost::bind (&PlayServer::run, server));
- _frame = new DOMFrame ();
- SetTopWindow (_frame);
- _frame->Maximize ();
- if (splash) {
- splash->Destroy ();
- }
- _frame->Show ();
+ if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) {
+ try {
+ _frame->load_dcp (_dcp_to_load);
+ } catch (exception& e) {
+ error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what()));
+ }
+ }
- signal_manager = new wxSignalManager (this);
+ Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
- if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) {
- try {
- _frame->load_dcp (_dcp_to_load);
- } catch (exception& e) {
- error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what()));
+ if (Config::instance()->check_for_updates ()) {
+ UpdateChecker::instance()->run ();
}
}
-
- Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
-
- if (Config::instance()->check_for_updates ()) {
- UpdateChecker::instance()->run ();
+ catch (exception& e)
+ {
+ if (splash) {
+ splash->Destroy ();
+ }
+ error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what()));
}
return true;
}
- catch (exception& e)
- {
- error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what()));
- return true;
- }
void OnInitCmdLine (wxCmdLineParser& parser)
{
_dcp_to_load = wx_to_std (parser.GetParam (0));
}
+ wxString config;
+ if (parser.Found("c", &config)) {
+ Config::override_path = wx_to_std (config);
+ }
+
return true;
}
projects / dcpomatic.git / blobdiff