diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-03-01 00:18:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-03-01 00:18:47 +0100 |
| commit | b24104d631b8c6f44d95f28e2ff3bc608cb221a7 (patch) | |
| tree | 64069363839f1d35521acab6737d21501b57f369 /src/tools/dcpomatic_player.cc | |
| parent | 048c84a9a0bdcad6fbd487bacb3ed57765d956c5 (diff) | |
Support playlists in the player in dual-screen mode.v2.15.45
Diffstat (limited to 'src/tools/dcpomatic_player.cc')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 4b63441f7..ae1bc4c81 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - 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. @@ -28,6 +28,7 @@ #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 @@ -250,7 +251,13 @@ public: _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)); |