/*
- Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "wx/player_config_dialog.h"
#include "wx/verify_dcp_dialog.h"
#include "wx/standard_controls.h"
-#include "wx/swaroop_controls.h"
+#include "wx/playlist_controls.h"
+#include "wx/timer_display.h"
+#include "wx/system_information_dialog.h"
+#include "wx/player_stress_tester.h"
+#include "wx/verify_dcp_progress_dialog.h"
#include "lib/cross.h"
#include "lib/config.h"
#include "lib/util.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 <wx/preferences.h>
#include <wx/progdlg.h>
#include <wx/display.h>
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
#endif
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/algorithm/string.hpp>
#include <iostream>
#ifdef check
#define MAX_CPLS 32
-using std::string;
using std::cout;
-using std::list;
+using std::dynamic_pointer_cast;
using std::exception;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
using std::vector;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::weak_ptr;
using boost::scoped_array;
using boost::optional;
-using boost::dynamic_pointer_cast;
using boost::thread;
using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::raw_convert;
+using namespace dcpomatic;
enum {
ID_file_open = 1,
ID_help_report_a_problem,
ID_tools_verify,
ID_tools_check_for_updates,
+ ID_tools_timing,
+ ID_tools_system_information,
/* IDs for shortcuts (with no associated menu item) */
ID_start_stop,
- ID_back_frame,
- ID_forward_frame
+ ID_go_back_frame,
+ ID_go_forward_frame,
+ ID_go_back_small_amount,
+ ID_go_forward_small_amount,
+ ID_go_back_medium_amount,
+ ID_go_forward_medium_amount,
+ ID_go_back_large_amount,
+ ID_go_forward_large_amount,
+ ID_go_to_start,
+ ID_go_to_end
};
class DOMFrame : public wxFrame
, _history_items (0)
, _history_position (0)
, _history_separator (0)
+ , _system_information_dialog (0)
, _view_full_screen (0)
, _view_dual_screen (0)
+ , _main_sizer (new wxBoxSizer (wxVERTICAL))
{
- dcpomatic_log.reset (new NullLog());
+ dcpomatic_log = make_shared<NullLog>();
#if defined(DCPOMATIC_WINDOWS)
maybe_open_console ();
cout << "DCP-o-matic Player is starting." << "\n";
#endif
- wxMenuBar* bar = new wxMenuBar;
+ auto bar = new wxMenuBar;
setup_menu (bar);
set_menu_sensitivity ();
SetMenuBar (bar);
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);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_timing, this), ID_tools_timing);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this), ID_tools_system_information);
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
_overall_panel = new wxPanel (this, wxID_ANY);
_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
+ if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) {
+ auto pc = new PlaylistControls (_overall_panel, _viewer);
+ _controls = pc;
+ pc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1));
+ } else {
+ _controls = new StandardControls (_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, _1));
_info = new PlayerInformation (_overall_panel, _viewer);
setup_main_sizer (Config::instance()->player_mode());
#ifdef __WXOSX__
- int accelerators = 4;
+ int accelerators = 12;
#else
- int accelerators = 3;
+ int accelerators = 11;
#endif
+ _stress.setup (this, _controls);
+
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);
+ accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
+ accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_go_back_frame);
+ accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_go_forward_frame);
+ accel[3].Set(wxACCEL_SHIFT, WXK_LEFT, ID_go_back_small_amount);
+ accel[4].Set(wxACCEL_SHIFT, WXK_RIGHT, ID_go_forward_small_amount);
+ accel[5].Set(wxACCEL_CTRL, WXK_LEFT, ID_go_back_medium_amount);
+ accel[6].Set(wxACCEL_CTRL, WXK_RIGHT, ID_go_forward_medium_amount);
+ accel[7].Set(wxACCEL_SHIFT | wxACCEL_CTRL, WXK_LEFT, ID_go_back_large_amount);
+ accel[8].Set(wxACCEL_SHIFT | wxACCEL_CTRL, WXK_RIGHT, ID_go_forward_large_amount);
+ accel[9].Set(wxACCEL_NORMAL, WXK_HOME, ID_go_to_start);
+ accel[10].Set(wxACCEL_NORMAL, WXK_END, ID_go_to_end);
#ifdef __WXOSX__
- accel[3].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
+ accel[11].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
#endif
wxAcceleratorTable accel_table (accelerators, accel);
SetAcceleratorTable (accel_table);
delete[] accel;
- 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);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::start_stop_pressed, this), ID_start_stop);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_back_frame, this), ID_go_back_frame);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_forward_frame, this), ID_go_forward_frame);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -60), ID_go_back_small_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 60), ID_go_forward_small_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -600), ID_go_back_medium_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 600), ID_go_forward_medium_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -3600), ID_go_back_large_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 3600), ID_go_forward_large_amount);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_start, this), ID_go_to_start);
+ Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_end, this), ID_go_to_end);
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."));
- }
+ _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1));
}
-#endif
void setup_main_sizer (Config::PlayerMode mode)
{
- wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
+ _main_sizer->Detach (_viewer->panel());
+ _main_sizer->Detach (_controls);
+ _main_sizer->Detach (_info);
if (mode != Config::PLAYER_MODE_DUAL) {
- main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+ _main_sizer->Add (_viewer->panel(), 1, wxEXPAND);
}
- 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);
+ _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);
+ for (auto i: _film->content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (d && !d->kdm_timing_window_valid()) {
ok = false;
}
void playback_started (DCPTime time)
{
/* XXX: this only logs the first piece of content; probably should be each piece? */
+ if (_film->content().empty()) {
+ return;
+ }
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto dcp = dynamic_pointer_cast<DCPContent>(_film->content().front());
if (dcp) {
- DCPExaminer ex (dcp);
+ DCPExaminer ex (dcp, true);
shared_ptr<dcp::CPL> playing_cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+ for (auto i: ex.cpls()) {
if (!dcp->cpl() || i->id() == *dcp->cpl()) {
playing_cpl = i;
}
"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()
+ playing_cpl->annotation_text().get_value_or("").c_str()
)
);
}
- shared_ptr<FFmpegContent> ffmpeg = dynamic_pointer_cast<FFmpegContent>(_film->content().front());
+ auto ffmpeg = dynamic_pointer_cast<FFmpegContent>(_film->content().front());
if (ffmpeg) {
_controls->log (
wxString::Format(
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()));
}
reset_film ();
try {
- shared_ptr<DCPContent> dcp (new DCPContent(dir));
- _film->examine_and_add_content (dcp, true);
+ _stress.set_suspended (true);
+ auto dcp = make_shared<DCPContent>(dir);
+ auto job = make_shared<ExamineContentJob>(_film, dcp);
+ _examine_job_connection = job->Finished.connect(bind(&DOMFrame::add_dcp_to_film, this, weak_ptr<Job>(job), weak_ptr<Content>(dcp)));
+ JobManager::instance()->add (job);
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) {
+ } catch (dcp::ReadError& e) {
error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
+ } catch (DCPError& e) {
+ error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
+ }
+ }
+
+ void add_dcp_to_film (weak_ptr<Job> weak_job, weak_ptr<Content> weak_content)
+ {
+ auto job = weak_job.lock ();
+ if (!job || !job->finished_ok()) {
+ return;
+ }
+
+ auto content = weak_content.lock ();
+ if (!content) {
+ return;
}
+
+ _film->add_content (content);
+ _stress.set_suspended (false);
}
void reset_film_weak (weak_ptr<Film> weak_film)
{
- shared_ptr<Film> film = weak_film.lock ();
+ auto film = weak_film.lock ();
if (film) {
reset_film (film);
}
void reset_film (shared_ptr<Film> film = shared_ptr<Film>(new Film(optional<boost::filesystem::path>())))
{
_film = film;
+ _film->set_tolerant (true);
+ _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS);
_viewer->set_film (_film);
_controls->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) {
+ if (type != ChangeType::DONE || property != Film::Property::CONTENT) {
return;
}
/* 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);
+ for (auto i: _film->content()) {
+ auto dcp = dynamic_pointer_cast<DCPContent>(i);
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ for (auto j: i->text) {
j->set_use (true);
}
if (i->video) {
- Ratio const * r = Ratio::nearest_from_ratio(i->video->size().ratio());
+ auto 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) {
+ if (i->video && i->video->frame_type() != VideoFrameType::TWO_D) {
_film->set_three_d (true);
}
}
set_menu_sensitivity ();
- wxMenuItemList old = _cpl_menu->GetMenuItems();
- for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
- _cpl_menu->Remove (*i);
+ auto old = _cpl_menu->GetMenuItems();
+ for (auto const& i: old) {
+ _cpl_menu->Remove (i);
}
if (_film->content().size() == 1) {
/* Offer a CPL menu */
- shared_ptr<DCPContent> first = dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto first = dynamic_pointer_cast<DCPContent>(_film->content().front());
if (first) {
- DCPExaminer ex (first);
+ DCPExaminer ex (first, true);
int id = ID_view_cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
- wxMenuItem* j = _cpl_menu->AppendRadioItem(
+ for (auto i: ex.cpls()) {
+ auto j = _cpl_menu->AppendRadioItem(
id,
- wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
+ wxString::Format("%s (%s)", std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data())
);
j->Check(!first->cpl() || i->id() == *first->cpl());
++id;
}
}
+ void load_stress_script (boost::filesystem::path path)
+ {
+ _stress.load_script (path);
+ }
+
private:
+ void examine_content ()
+ {
+ DCPOMATIC_ASSERT (_film);
+ auto dcp = dynamic_pointer_cast<DCPContent>(_film->content().front());
+ DCPOMATIC_ASSERT (dcp);
+ dcp->examine (_film, shared_ptr<Job>());
+
+ /* Examining content re-creates the TextContent objects, so we must re-enable them */
+ for (auto i: dcp->text) {
+ i->set_use (true);
+ }
+ }
+
+ bool report_errors_from_last_job (wxWindow* parent) const
+ {
+ auto jm = JobManager::instance ();
+
+ DCPOMATIC_ASSERT (!jm->get().empty());
+
+ auto last = jm->get().back();
+ if (last->finished_in_error()) {
+ error_dialog(parent, wxString::Format(_("Could not load DCP.\n\n%s."), std_to_wx(last->error_summary()).data()), std_to_wx(last->error_details()));
+ return false;
+ }
+
+ return true;
+ }
+
void setup_menu (wxMenuBar* m)
{
_file_menu = new wxMenu;
_file_menu->Append (ID_file_open, _("&Open...\tCtrl-O"));
_file_add_ov = _file_menu->Append (ID_file_add_ov, _("&Add OV..."));
- _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("&Add KDM..."));
+ _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("Add &KDM..."));
_history_position = _file_menu->GetMenuItems().GetCount();
#endif
#ifdef __WXOSX__
- wxMenuItem* prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+ auto prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
#else
- wxMenu* edit = new wxMenu;
- wxMenuItem* prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+ auto edit = new wxMenu;
+ auto 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();
+ auto view = new wxMenu;
+ auto 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->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"));
+ auto tools = new wxMenu;
+ _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP..."));
tools->AppendSeparator ();
tools->Append (ID_tools_check_for_updates, _("Check for updates"));
+ tools->Append (ID_tools_timing, _("Timing..."));
+ tools->Append (ID_tools_system_information, _("System information..."));
- wxMenu* help = new wxMenu;
+ auto help = new wxMenu;
#ifdef __WXOSX__
help->Append (wxID_ABOUT, _("About DCP-o-matic"));
#else
void file_open ()
{
- wxString d = wxStandardPaths::Get().GetDocumentsDir();
+ auto d = wxStandardPaths::Get().GetDocumentsDir();
if (Config::instance()->last_player_load_directory()) {
d = std_to_wx (Config::instance()->last_player_load_directory()->string());
}
- wxDirDialog* c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+ auto c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
int r;
while (true) {
void file_add_ov ()
{
- wxDirDialog* c = new wxDirDialog (
+ auto c = new wxDirDialog (
this,
_("Select DCP to open as OV"),
wxStandardPaths::Get().GetDocumentsDir(),
if (r == wxID_OK) {
DCPOMATIC_ASSERT (_film);
- shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
dcp->add_ov (wx_to_std(c->GetPath()));
- JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob (_film, dcp)));
+ JobManager::instance()->add(make_shared<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) {
+ for (auto i: dcp->text) {
i->set_use (true);
}
if (dcp->video) {
- Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
+ auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
if (r) {
_film->set_container(r);
}
void file_add_kdm ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select KDM"));
+ auto d = new wxFileDialog (this, _("Select KDM"));
if (d->ShowModal() == wxID_OK) {
DCPOMATIC_ASSERT (_film);
- shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
try {
- dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
- dcp->examine (_film, shared_ptr<Job>());
+ if (dcp) {
+ _viewer->set_coalesce_player_changes (true);
+ dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)));
+ examine_content();
+ _viewer->set_coalesce_player_changes (false);
+ }
} catch (exception& e) {
error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
d->Destroy ();
void file_history (wxCommandEvent& event)
{
- vector<boost::filesystem::path> history = Config::instance()->player_history ();
+ auto history = Config::instance()->player_history ();
int n = event.GetId() - ID_file_history;
if (n >= 0 && n < static_cast<int> (history.size ())) {
- load_dcp (history[n]);
+ try {
+ load_dcp (history[n]);
+ } catch (exception& e) {
+ error_dialog (0, std_to_wx(String::compose(wx_to_std(_("Could not load DCP %1.")), history[n])), std_to_wx(e.what()));
+ }
}
}
void view_cpl (wxCommandEvent& ev)
{
- shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
- DCPExaminer ex (dcp);
+ DCPExaminer ex (dcp, true);
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();
+ auto cpls = ex.cpls();
+ auto i = cpls.begin();
while (id > 0) {
++i;
--id;
}
+ _viewer->set_coalesce_player_changes (true);
dcp->set_cpl ((*i)->id());
- dcp->examine (_film, shared_ptr<Job>());
+ examine_content ();
+ _viewer->set_coalesce_player_changes (false);
+
+ _info->triggered_update ();
}
void view_full_screen ()
switch (Config::instance()->image_display()) {
case 0:
_dual_screen->Move (0, 0);
- Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+ Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
break;
case 1:
- _dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+ _dual_screen->Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
// (0, 0) doesn't seem to work for some strange reason
Move (8, 8);
break;
void tools_verify ()
{
- shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
+ auto dcp = std::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) {
+ auto job = make_shared<VerifyDCPJob>(dcp->directories());
+ auto progress = new VerifyDCPProgressDialog(this, _("DCP-o-matic Player"));
+ bool const completed = progress->run (job);
+ progress->Destroy ();
+ if (!completed) {
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);
+ auto d = new VerifyDCPDialog (this, job);
d->ShowModal ();
d->Destroy ();
}
_update_news_requested = true;
}
+ void tools_timing ()
+ {
+ auto d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets());
+ d->ShowModal ();
+ d->Destroy ();
+ }
+
+ void tools_system_information ()
+ {
+ if (!_system_information_dialog) {
+ _system_information_dialog = new SystemInformationDialog (this, _viewer);
+ }
+
+ _system_information_dialog->Show ();
+ }
+
void help_about ()
{
- AboutDialog* d = new AboutDialog (this);
+ auto d = new AboutDialog (this);
d->ShowModal ();
d->Destroy ();
}
void help_report_a_problem ()
{
- ReportProblemDialog* d = new ReportProblemDialog (this);
+ auto d = new ReportProblemDialog (this);
if (d->ShowModal () == wxID_OK) {
d->report ();
}
void update_checker_state_changed ()
{
- UpdateChecker* uc = UpdateChecker::instance ();
+ auto uc = UpdateChecker::instance ();
bool const announce =
_update_news_requested ||
return;
}
- if (uc->state() == UpdateChecker::YES) {
- UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ());
+ if (uc->state() == UpdateChecker::State::YES) {
+ auto dialog = new UpdateDialog (this, uc->stable (), uc->test ());
dialog->ShowModal ();
dialog->Destroy ();
- } else if (uc->state() == UpdateChecker::FAILED) {
+ } else if (uc->state() == UpdateChecker::State::FAILED) {
error_dialog (this, _("The DCP-o-matic download server could not be contacted."));
} else {
error_dialog (this, _("There are no new versions of DCP-o-matic available."));
_file_menu->Remove (_history_separator);
}
delete _history_separator;
- _history_separator = 0;
+ _history_separator = nullptr;
int pos = _history_position;
- vector<boost::filesystem::path> history = Config::instance()->player_history ();
+ /* Clear out non-existant history items before we re-build the menu */
+ Config::instance()->clean_player_history ();
+ auto history = Config::instance()->player_history ();
if (!history.empty ()) {
_history_separator = _file_menu->InsertSeparator (pos++);
_history_items = history.size ();
if (prop == Config::PLAYER_DEBUG_LOG) {
- optional<boost::filesystem::path> p = Config::instance()->player_debug_log_file();
+ auto p = Config::instance()->player_debug_log_file();
if (p) {
- dcpomatic_log.reset (new FileLog(*p));
+ dcpomatic_log = make_shared<FileLog>(*p);
} else {
- dcpomatic_log.reset (new NullLog());
+ dcpomatic_log = make_shared<NullLog>();
}
- dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_PLAYER);
+ dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW);
}
}
}
}
- void back_frame ()
+ void go_back_frame ()
{
_viewer->seek_by (-_viewer->one_video_frame(), true);
}
- void forward_frame ()
+ void go_forward_frame ()
{
_viewer->seek_by (_viewer->one_video_frame(), true);
}
-private:
+ void go_seconds (int s)
+ {
+ _viewer->seek_by (DCPTime::from_seconds(s), true);
+ }
+
+ void go_to_start ()
+ {
+ _viewer->seek (DCPTime(), true);
+ }
+
+ void go_to_end ()
+ {
+ _viewer->seek (_film->length() - _viewer->one_video_frame(), true);
+ }
wxFrame* _dual_screen;
bool _update_news_requested;
wxMenuItem* _history_separator;
shared_ptr<FilmViewer> _viewer;
Controls* _controls;
- boost::shared_ptr<Film> _film;
+ SystemInformationDialog* _system_information_dialog;
+ std::shared_ptr<Film> _film;
boost::signals2::scoped_connection _config_changed_connection;
+ boost::signals2::scoped_connection _examine_job_connection;
wxMenuItem* _file_add_ov;
wxMenuItem* _file_add_kdm;
wxMenuItem* _tools_verify;
wxMenuItem* _view_full_screen;
wxMenuItem* _view_dual_screen;
+ wxSizer* _main_sizer;
+ PlayerStressTester _stress;
};
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_OPTION, "s", "stress", "File containing description of stress test", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
App ()
: wxApp ()
, _frame (0)
- {}
+ {
+#ifdef DCPOMATIC_LINUX
+ XInitThreads ();
+#endif
+ }
private:
unsetenv ("UBUNTU_MENUPROXY");
#endif
-#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+ make_foreground_application ();
#endif
dcpomatic_setup_path_encoding ();
}
}
+ if (_stress) {
+ try {
+ _frame->load_stress_script (*_stress);
+ } catch (exception& e) {
+ error_dialog (0, wxString::Format("Could not load stress test file %s", std_to_wx(*_stress)));
+ }
+ }
+
Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
if (Config::instance()->check_for_updates ()) {
if (parser.Found("c", &config)) {
Config::override_path = wx_to_std (config);
}
+ wxString stress;
+ if (parser.Found("s", &stress)) {
+ _stress = wx_to_std (stress);
+ }
return true;
}
DOMFrame* _frame;
string _dcp_to_load;
+ boost::optional<string> _stress;
};
IMPLEMENT_APP (App)
projects / dcpomatic.git / blobdiff