X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=c0587ed5557efcf64ec9acf48871e7fa6f422065;hb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;hp=c7a7243757ca20816e3626529a9567f8ac95d340;hpb=2e6f03cbb2c5664bd338ad28bfd6c54732e64b47;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index c7a724375..c0587ed55 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2020 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -29,12 +29,10 @@ #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 "wx/verify_dcp_progress_dialog.h" #include "lib/cross.h" #include "lib/config.h" #include "lib/util.h" @@ -55,11 +53,10 @@ #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 #include #include #include @@ -73,7 +70,7 @@ #ifdef __WXGTK__ #include #endif -#include +#include #include #include @@ -83,18 +80,22 @@ #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; @@ -150,15 +151,16 @@ public: , _system_information_dialog (0) , _view_full_screen (0) , _view_dual_screen (0) -{ - dcpomatic_log.reset (new NullLog()); + , _main_sizer (new wxBoxSizer (wxVERTICAL)) + { + dcpomatic_log = make_shared(); #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); @@ -197,19 +199,13 @@ public: _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 if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { - PlaylistControls* pc = new PlaylistControls (_overall_panel, _viewer); + 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); } -#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)); @@ -258,84 +254,47 @@ public: 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 (); _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); - -#ifdef DCPOMATIC_VARIANT_SWAROOP - sc->check_restart (); -#endif } -#ifdef DCPOMATIC_VARIANT_SWAROOP - void monitor_checker_state_changed () + ~DOMFrame () { - if (!MonitorChecker::instance()->ok()) { - _viewer->stop (); - error_dialog (this, _("The required display devices are not connected correctly.")); - } + /* It's important that this is stopped before our frame starts destroying its children, + * otherwise UI elements that it depends on will disappear from under it. + */ + _viewer.reset (); } - 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); + _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 i, _film->content()) { - shared_ptr d = dynamic_pointer_cast(i); + for (auto i: _film->content()) { + auto d = dynamic_pointer_cast(i); if (d && !d->kdm_timing_window_valid()) { ok = false; } } -#ifdef DCPOMATIC_VARIANT_SWAROOP - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr c = dynamic_pointer_cast(i); - if (c && !c->kdm_timing_window_valid()) { - ok = false; - } - } -#endif - if (!ok) { error_dialog (this, _("The KDM does not allow playback of this content at this time.")); } @@ -350,11 +309,11 @@ public: return; } - shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); + auto dcp = dynamic_pointer_cast(_film->content().front()); if (dcp) { DCPExaminer ex (dcp, true); shared_ptr playing_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { + for (auto i: ex.cpls()) { if (!dcp->cpl() || i->id() == *dcp->cpl()) { playing_cpl = i; } @@ -366,12 +325,12 @@ public: "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 ffmpeg = dynamic_pointer_cast(_film->content().front()); + auto ffmpeg = dynamic_pointer_cast(_film->content().front()); if (ffmpeg) { _controls->log ( wxString::Format( @@ -385,14 +344,6 @@ public: 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())); } @@ -410,17 +361,25 @@ public: reset_film (); try { _stress.set_suspended (true); - shared_ptr dcp (new DCPContent(dir)); - shared_ptr job (new ExamineContentJob(_film, dcp)); + // here + auto dcp = make_shared(dir); + auto job = make_shared(_film, dcp); _examine_job_connection = job->Finished.connect(bind(&DOMFrame::add_dcp_to_film, this, weak_ptr(job), weak_ptr(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 (ProjectFolderError &) { + error_dialog ( + this, + wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), + _( + "This looks like a DCP-o-matic project folder, which cannot be loaded into the player. " + "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to play." + ) + ); } 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) { @@ -430,12 +389,12 @@ public: void add_dcp_to_film (weak_ptr weak_job, weak_ptr weak_content) { - shared_ptr job = weak_job.lock (); + auto job = weak_job.lock (); if (!job || !job->finished_ok()) { return; } - shared_ptr content = weak_content.lock (); + auto content = weak_content.lock (); if (!content) { return; } @@ -446,7 +405,7 @@ public: void reset_film_weak (weak_ptr weak_film) { - shared_ptr film = weak_film.lock (); + auto film = weak_film.lock (); if (film) { reset_film (film); } @@ -465,7 +424,7 @@ public: 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; } @@ -476,15 +435,15 @@ public: /* Start off as Flat */ _film->set_container (Ratio::from_id("185")); - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr dcp = dynamic_pointer_cast(i); + for (auto i: _film->content()) { + auto dcp = dynamic_pointer_cast(i); - BOOST_FOREACH (shared_ptr 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); @@ -492,7 +451,7 @@ public: } /* 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); } } @@ -502,21 +461,21 @@ public: 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 first = dynamic_pointer_cast(_film->content().front()); + auto first = dynamic_pointer_cast(_film->content().front()); if (first) { DCPExaminer ex (first, true); int id = ID_view_cpl; - BOOST_FOREACH (shared_ptr 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; @@ -532,13 +491,26 @@ public: private: + void examine_content () + { + DCPOMATIC_ASSERT (_film); + auto dcp = dynamic_pointer_cast(_film->content().front()); + DCPOMATIC_ASSERT (dcp); + dcp->examine (_film, shared_ptr()); + + /* 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 { - JobManager* jm = JobManager::instance (); + auto jm = JobManager::instance (); DCPOMATIC_ASSERT (!jm->get().empty()); - shared_ptr last = jm->get().back(); + 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; @@ -567,24 +539,22 @@ private: #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 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...")); @@ -594,14 +564,14 @@ private: 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 @@ -620,12 +590,12 @@ private: 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) { @@ -648,7 +618,7 @@ private: void file_add_ov () { - wxDirDialog* c = new wxDirDialog ( + auto c = new wxDirDialog ( this, _("Select DCP to open as OV"), wxStandardPaths::Get().GetDocumentsDir(), @@ -667,19 +637,19 @@ private: if (r == wxID_OK) { DCPOMATIC_ASSERT (_film); - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); dcp->add_ov (wx_to_std(c->GetPath())); - JobManager::instance()->add(shared_ptr(new ExamineContentJob (_film, dcp))); + JobManager::instance()->add(make_shared(_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 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); } @@ -692,30 +662,18 @@ private: 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); -#ifdef DCPOMATIC_VARIANT_SWAROOP - shared_ptr ffmpeg = boost::dynamic_pointer_cast(_film->content().front()); - if (ffmpeg) { - try { - ffmpeg->add_kdm (EncryptedECinemaKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); - } catch (exception& e) { - error_dialog (this, wxString::Format(_("Could not load KDM.")), std_to_wx(e.what())); - d->Destroy(); - return; - } - } -#endif - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); -#ifndef DCPOMATIC_VARIANT_SWAROOP + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); -#endif try { 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))); - dcp->examine (_film, shared_ptr()); + 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())); @@ -730,7 +688,7 @@ private: void file_history (wxCommandEvent& event) { - vector history = Config::instance()->player_history (); + auto history = Config::instance()->player_history (); int n = event.GetId() - ID_file_history; if (n >= 0 && n < static_cast (history.size ())) { try { @@ -767,21 +725,25 @@ private: void view_cpl (wxCommandEvent& ev) { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); DCPExaminer ex (dcp, true); int id = ev.GetId() - ID_view_cpl; DCPOMATIC_ASSERT (id >= 0); DCPOMATIC_ASSERT (id < int(ex.cpls().size())); - list > cpls = ex.cpls(); - list >::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()); + examine_content (); + _viewer->set_coalesce_player_changes (false); + + _info->triggered_update (); } void view_full_screen () @@ -861,21 +823,18 @@ private: void tools_verify () { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - JobManager* jm = JobManager::instance (); - jm->add (shared_ptr (new VerifyDCPJob (dcp->directories()))); - bool const ok = display_progress (_("DCP-o-matic Player"), _("Verifying DCP")); - if (!ok) { + auto job = make_shared(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 last = dynamic_pointer_cast (jm->get().back()); - DCPOMATIC_ASSERT (last); - - VerifyDCPDialog* d = new VerifyDCPDialog (this, last); + auto d = new VerifyDCPDialog (this, job); d->ShowModal (); d->Destroy (); } @@ -888,7 +847,7 @@ private: void tools_timing () { - TimerDisplay* d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets()); + auto d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets()); d->ShowModal (); d->Destroy (); } @@ -904,14 +863,14 @@ private: 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 (); } @@ -920,7 +879,7 @@ private: void update_checker_state_changed () { - UpdateChecker* uc = UpdateChecker::instance (); + auto uc = UpdateChecker::instance (); bool const announce = _update_news_requested || @@ -933,11 +892,11 @@ private: 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.")); @@ -981,13 +940,13 @@ private: _file_menu->Remove (_history_separator); } delete _history_separator; - _history_separator = 0; + _history_separator = nullptr; int pos = _history_position; /* Clear out non-existant history items before we re-build the menu */ Config::instance()->clean_player_history (); - vector history = Config::instance()->player_history (); + auto history = Config::instance()->player_history (); if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); @@ -1006,11 +965,11 @@ private: _history_items = history.size (); if (prop == Config::PLAYER_DEBUG_LOG) { - optional 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(*p); } else { - dcpomatic_log.reset (new NullLog()); + dcpomatic_log = make_shared(); } dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW); } @@ -1073,7 +1032,7 @@ private: shared_ptr _viewer; Controls* _controls; SystemInformationDialog* _system_information_dialog; - boost::shared_ptr _film; + std::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; boost::signals2::scoped_connection _examine_job_connection; wxMenuItem* _file_add_ov; @@ -1081,6 +1040,7 @@ private: wxMenuItem* _tools_verify; wxMenuItem* _view_full_screen; wxMenuItem* _view_dual_screen; + wxSizer* _main_sizer; PlayerStressTester _stress; };