diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-01 01:39:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-06-17 00:04:03 +0200 |
| commit | ec06811bae7ed4fc6bd80c3154fd473028ee8e13 (patch) | |
| tree | b398119a1a84d261ee16b57171652fd8714d657a /src/wx | |
| parent | 21e9bd77598f7bb4588ca9b16a58667e3340f6d9 (diff) | |
Pass Ratio around as an object rather than a pointer.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/dcp_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 9d6eafe13..7582ba0fa 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -549,16 +549,16 @@ DCPPanel::setup_container() wxArrayString new_ratios; for (auto ratio: ratios) { - new_ratios.Add(std_to_wx(ratio->container_nickname())); + new_ratios.Add(std_to_wx(ratio.container_nickname())); } _container->set_entries(new_ratios); - auto iter = std::find_if(ratios.begin(), ratios.end(), [this](Ratio const* ratio) { return ratio == _film->container(); }); + auto iter = std::find_if(ratios.begin(), ratios.end(), [this](Ratio const& ratio) { return ratio == _film->container(); }); DCPOMATIC_ASSERT(iter != ratios.end()); checked_set(_container, iter - ratios.begin()); - auto const size = fit_ratio_within(_film->container()->ratio(), _film->full_frame()); + auto const size = fit_ratio_within(_film->container().ratio(), _film->full_frame()); checked_set(_container_size, wxString::Format(char_to_wx("%dx%d"), size.width, size.height)); setup_dcp_name(); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index b97ef7bfb..7b22999b0 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -309,7 +309,7 @@ FilmViewer::calculate_sizes() int const video_view_height = std::round(_video_view->get()->GetSize().y * scale); auto const view_ratio = float(video_view_width) / video_view_height; - auto const film_ratio = container ? container->ratio() : 1.78; + auto const film_ratio = container.ratio(); dcp::Size out_size; if (view_ratio < film_ratio) { |