diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-12 01:03:28 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-14 11:41:18 +0200 |
| commit | 449f383f13e5755c523db11f9adef53b58391025 (patch) | |
| tree | 7751c6ede10455de02aa85dcd00d17109c9d57a6 /src/wx/markers_dialog.cc | |
| parent | 5e640ac3e2f6d5fb079ff65659a1483ddac8672e (diff) | |
Cleanup: use simpler ownership for FilmViewer.
Diffstat (limited to 'src/wx/markers_dialog.cc')
| -rw-r--r-- | src/wx/markers_dialog.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc index c8561ad74..9c9850af0 100644 --- a/src/wx/markers_dialog.cc +++ b/src/wx/markers_dialog.cc @@ -47,7 +47,7 @@ using dcpomatic::DCPTime; class Marker { public: - Marker (wxWindow* parent, wxGridBagSizer* grid, int row, weak_ptr<Film> film_, weak_ptr<FilmViewer> viewer_, wxString name, dcp::Marker type_) + Marker(wxWindow* parent, wxGridBagSizer* grid, int row, weak_ptr<Film> film_, FilmViewer const& viewer_, wxString name, dcp::Marker type_) : film (film_) , viewer (viewer_) , type (type_) @@ -92,9 +92,7 @@ private: { auto f = film.lock (); DCPOMATIC_ASSERT (f); - auto v = viewer.lock (); - DCPOMATIC_ASSERT (v); - timecode->set (v->position(), f->video_frame_rate()); + timecode->set(viewer.position(), f->video_frame_rate()); changed (); } @@ -116,7 +114,7 @@ private: } weak_ptr<Film> film; - weak_ptr<FilmViewer> viewer; + FilmViewer const& viewer; dcp::Marker type; CheckBox* checkbox; Timecode<dcpomatic::DCPTime>* timecode; @@ -124,7 +122,7 @@ private: }; -MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<FilmViewer> viewer) +MarkersDialog::MarkersDialog(wxWindow* parent, weak_ptr<Film> film, FilmViewer const& viewer) : wxDialog (parent, wxID_ANY, _("Markers")) , _film (film) { |