Put two video views inside FilmViewer, one for main and one for sign language.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 1b2b98729ddd789187a144d8bf51aab0dd0af40f..4fabdfc544ced3df22f2ad1dd4695c2a3a128897 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -314,11 +314,11 @@ public:
 
        void setup_main_sizer (Config::PlayerMode mode)
        {
-               _main_sizer->Detach(_viewer.panel());
+               _main_sizer->Detach(_viewer.panel(VideoType::MAIN));
                _main_sizer->Detach (_controls);
                _main_sizer->Detach (_info);
                if (mode != Config::PLAYER_MODE_DUAL) {
-                       _main_sizer->Add(_viewer.panel(), 1, wxEXPAND);
+                       _main_sizer->Add(_viewer.panel(VideoType::MAIN), 1, wxEXPAND);
                }
                _main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6);
                _main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6);
@@ -850,8 +850,8 @@ private:
                        _dual_screen = new wxFrame (this, wxID_ANY, wxT(""));
                        _dual_screen->SetBackgroundColour (wxColour(0, 0, 0));
                        _dual_screen->ShowFullScreen (true);
-                       _viewer.panel()->Reparent(_dual_screen);
-                       _viewer.panel()->SetFocus();
+                       _viewer.panel(VideoType::MAIN)->Reparent(_dual_screen);
+                       _viewer.panel(VideoType::MAIN)->SetFocus();
                        _dual_screen->Show ();
                        if (wxDisplay::GetCount() > 1) {
                                switch (Config::instance()->image_display()) {
@@ -869,7 +869,7 @@ private:
                        _dual_screen->Bind(wxEVT_CHAR_HOOK, boost::bind(&DOMFrame::dual_screen_key_press, this, _1));
                } else {
                        if (_dual_screen) {
-                               _viewer.panel()->Reparent(_overall_panel);
+                               _viewer.panel(VideoType::MAIN)->Reparent(_overall_panel);
                                _dual_screen->Destroy ();
                                _dual_screen = 0;
                        }