From b24104d631b8c6f44d95f28e2ff3bc608cb221a7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 1 Mar 2020 00:18:47 +0100 Subject: Support playlists in the player in dual-screen mode. --- src/tools/dcpomatic_player.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/tools/dcpomatic_player.cc') 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 + Copyright (C) 2017-2020 Carl Hetherington 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)); -- cgit v1.2.3