*/
-
#include "wx/wx_signal_manager.h"
#include "wx/wx_util.h"
#include "wx/about_dialog.h"
#include "wx/update_dialog.h"
#include "wx/player_config_dialog.h"
#include "wx/verify_dcp_dialog.h"
-#include "wx/control_film_viewer.h"
+#include "wx/controls.h"
+#include "wx/cinema_player_dialog.h"
#include "lib/cross.h"
#include "lib/config.h"
#include "lib/util.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,
: wxFrame (0, -1, _("DCP-o-matic Player"))
, _update_news_requested (false)
, _info (0)
+ , _mode (Config::instance()->player_mode())
, _config_dialog (0)
+ , _cinema_dialog (0)
, _file_menu (0)
, _history_items (0)
, _history_position (0)
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);
_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
- _info = new PlayerInformation (overall_panel, _viewer);
+ _viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
+ _info = new PlayerInformation (_overall_panel, _viewer);
wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
- main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALL, 6);
+ main_sizer->Add (_viewer->panel(), 1, wxEXPAND);
main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6);
- overall_panel->SetSizer (main_sizer);
+ _overall_panel->SetSizer (main_sizer);
#ifdef __WXOSX__
int accelerators = 4;
Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
+ _cinema_dialog = new CinemaPlayerDialog (this, _viewer);
+
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+
+ setup_screen ();
+ }
+
+ bool playback_permitted ()
+ {
+ 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 set_decode_reduction (optional<int> reduction)
}
_viewer->set_film (_film);
- _viewer->set_position (DCPTime ());
+ _viewer->seek (DCPTime(), true);
_info->triggered_update ();
Config::instance()->add_to_player_history (dir);
wxMenu* view = new wxMenu;
optional<int> c = Config::instance()->decode_reduction();
_view_cpl = view->Append(ID_view_cpl, _("CPL"), _cpl_menu);
+ view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11"))->Check(_mode == Config::PLAYER_MODE_FULL);
+ view->AppendCheckItem(ID_view_dual_screen, _("Dual screen\tShift+F11"))->Check(_mode == Config::PLAYER_MODE_DUAL);
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));
dcp->examine (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 ();
+ }
+
+ void view_dual_screen ()
+ {
+ if (_mode == Config::PLAYER_MODE_DUAL) {
+ _mode = Config::PLAYER_MODE_WINDOW;
+ } else {
+ _mode = Config::PLAYER_MODE_DUAL;
+ }
+ setup_screen ();
+ }
+
+ void setup_screen ()
+ {
+ _controls->Show (_mode == Config::PLAYER_MODE_WINDOW);
+ _info->Show (_mode == Config::PLAYER_MODE_WINDOW);
+ _overall_panel->SetBackgroundColour (_mode == Config::PLAYER_MODE_WINDOW ? wxNullColour : wxColour(0, 0, 0));
+ ShowFullScreen (_mode != Config::PLAYER_MODE_WINDOW);
+ if (_mode == Config::PLAYER_MODE_DUAL) {
+ _cinema_dialog->Show ();
+ if (wxDisplay::GetCount() > 1) {
+ this->Move (0, 0);
+ _cinema_dialog->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+ }
+ }
+ }
+
void view_closed_captions ()
{
_viewer->show_closed_captions ();
void back_frame ()
{
- _viewer->move (-_viewer->one_video_frame());
+ _viewer->seek_by (-_viewer->one_video_frame(), true);
}
void forward_frame ()
{
- _viewer->move (_viewer->one_video_frame());
+ _viewer->seek_by (_viewer->one_video_frame(), true);
}
private:
bool _update_news_requested;
PlayerInformation* _info;
+ Config::PlayerMode _mode;
wxPreferencesEditor* _config_dialog;
+ CinemaPlayerDialog* _cinema_dialog;
+ wxPanel* _overall_panel;
wxMenu* _file_menu;
wxMenuItem* _view_cpl;
wxMenu* _cpl_menu;
projects / dcpomatic.git / blobdiff