/*
- Copyright (C) 2017-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2020 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/playlist_controls.h"
+#ifdef DCPOMATIC_VARIANT_SWAROOP
#include "wx/swaroop_controls.h"
+#endif
#include "wx/timer_display.h"
#include "wx/system_information_dialog.h"
+#include "wx/player_stress_tester.h"
#include "lib/cross.h"
#include "lib/config.h"
#include "lib/util.h"
#include <wx/preferences.h>
#include <wx/progdlg.h>
#include <wx/display.h>
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
+#endif
#ifdef __WXOSX__
#include <ApplicationServices/ApplicationServices.h>
#endif
#include <boost/bind.hpp>
+#include <boost/algorithm/string.hpp>
#include <iostream>
#ifdef check
using boost::dynamic_pointer_cast;
using boost::thread;
using boost::bind;
+using dcp::raw_convert;
using namespace dcpomatic;
enum {
, _system_information_dialog (0)
, _view_full_screen (0)
, _view_dual_screen (0)
- {
+{
dcpomatic_log.reset (new NullLog());
#if defined(DCPOMATIC_WINDOWS)
_controls = sc;
sc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1));
#else
- _controls = new StandardControls (_overall_panel, _viewer, false);
+ if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) {
+ PlaylistControls* 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);
+ }
#endif
_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
_viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
int accelerators = 3;
#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);
#endif
setup_screen ();
+ _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1));
+
#ifdef DCPOMATIC_VARIANT_SWAROOP
sc->check_restart ();
#endif
shared_ptr<DCPContent> 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()) {
if (!dcp->cpl() || i->id() == *dcp->cpl()) {
reset_film ();
try {
+ _stress.set_suspended (true);
shared_ptr<DCPContent> dcp (new DCPContent(dir));
- _film->examine_and_add_content (dcp, true);
+ shared_ptr<Job> job (new 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;
}
}
+ void add_dcp_to_film (weak_ptr<Job> weak_job, weak_ptr<Content> weak_content)
+ {
+ shared_ptr<Job> job = weak_job.lock ();
+ if (!job || !job->finished_ok()) {
+ return;
+ }
+
+ shared_ptr<Content> 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 ();
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));
/* Offer a CPL menu */
shared_ptr<DCPContent> 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(
}
}
+ void load_stress_script (boost::filesystem::path path)
+ {
+ _stress.load_script (path);
+ }
+
private:
bool report_errors_from_last_job (wxWindow* parent) const
_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();
{
shared_ptr<DCPContent> dcp = boost::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()));
_viewer->seek_by (_viewer->one_video_frame(), true);
}
-private:
-
wxFrame* _dual_screen;
bool _update_news_requested;
PlayerInformation* _info;
SystemInformationDialog* _system_information_dialog;
boost::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;
+ 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:
}
}
+ 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)