diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-21 11:57:56 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-10 23:13:14 +0200 |
| commit | bed96db6eb73bd86ca06894c3acba010e5ed2635 (patch) | |
| tree | b9d69326426b1722d3635e8b9d9a1e7db46d41f4 /src/wx | |
| parent | 9db2168dcc14a803dcd9da047ddd70e2142d82e2 (diff) | |
Respect playlist's requested player crop.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/playlist_controls.cc | 9 | ||||
| -rw-r--r-- | src/wx/playlist_controls.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index c7dad4139..bde065659 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -149,7 +149,7 @@ PlaylistControls::deselect_playlist () _selected_playlist = boost::none; _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED); } - ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>())); + ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()), {}); } void @@ -380,8 +380,9 @@ PlaylistControls::reset_film () { DCPOMATIC_ASSERT (_selected_playlist); auto film = std::make_shared<Film>(optional<boost::filesystem::path>()); - film->add_content (_playlists[*_selected_playlist].get()[_selected_playlist_position].content); - ResetFilm (film); + auto entry = _playlists[*_selected_playlist].get(_selected_playlist_position); + film->add_content(entry.content); + ResetFilm(film, entry.crop_to_ratio); } void @@ -425,7 +426,7 @@ PlaylistControls::viewer_finished () } else { /* Finished the whole SPL */ _selected_playlist_position = 0; - ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>())); + ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()), {}); _play_button->Enable (true); _pause_button->Enable (false); } diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h index 76ec63824..d3f9c038e 100644 --- a/src/wx/playlist_controls.h +++ b/src/wx/playlist_controls.h @@ -35,7 +35,7 @@ public: when we have created one from a SPL. We could call a method in the player's DOMFrame but we don't have that in a header. */ - boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm; + boost::signals2::signal<void (std::weak_ptr<Film>, boost::optional<float>)> ResetFilm; void play () override; void stop () override; |