diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-11-06 20:33:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-09 00:05:00 +0100 |
| commit | 5c53a0ac655eeaeb07116ad30ca8e1dadefe4ca2 (patch) | |
| tree | 5750dd8e21d2f6971b8fbe92eaaa0b0589de6797 /src/tools | |
| parent | 3b26d2979c5c03c7e115b7b895220e0d76b57a8c (diff) | |
Put two video views inside FilmViewer, one for main and one for sign language.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 3735f4790..d1ab11c4b 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -388,7 +388,7 @@ public: auto job_manager_view = new JobManagerView(_right_panel, false); auto right_sizer = new wxBoxSizer (wxVERTICAL); - right_sizer->Add(_film_viewer.panel(), 2, wxEXPAND | wxALL, 6); + right_sizer->Add(_film_viewer.panel(VideoType::MAIN), 2, wxEXPAND | wxALL, 6); right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6); diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index ed72de172..3ceaed9c1 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -335,11 +335,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); @@ -911,8 +911,8 @@ private: _dual_screen = new wxFrame(this, wxID_ANY, {}); _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 (); LOG_DEBUG_PLAYER("Setting up dual screen mode with %1 displays", wxDisplay::GetCount()); for (auto index = 0U; index < wxDisplay::GetCount(); ++index) { @@ -933,13 +933,13 @@ private: }; auto const image_display = Config::instance()->image_display(); _dual_screen->Move(geometry[image_display].GetX(), geometry[image_display].GetY()); - _viewer.panel()->SetSize(geometry[image_display].GetWidth(), geometry[image_display].GetHeight()); + _viewer.panel(VideoType::MAIN)->SetSize(geometry[image_display].GetWidth(), geometry[image_display].GetHeight()); Move(geometry[1 - image_display].GetX(), geometry[1 - image_display].GetY()); } _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; } |