X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmarkers_dialog.cc;h=cc254b2a1edada6ed9157756b920ac6008816b32;hb=cb6948e0b23fba98d30052c4e4ca939bd3a6b8a7;hp=c8561ad743581ee6435ce2cbde3e1398c574f0cf;hpb=a4d0c85dba60e2837814bd100547189b9a193fff;p=dcpomatic.git

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index c8561ad74..cc254b2a1 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_)
@@ -71,7 +71,7 @@ public:
 		set_sensitivity ();
 
 		set_button->Bind (wxEVT_BUTTON, bind(&Marker::set, this));
-		checkbox->Bind (wxEVT_CHECKBOX, bind(&Marker::checkbox_clicked, this));
+		checkbox->bind(&Marker::checkbox_clicked, this);
 		timecode->Changed.connect (bind(&Marker::changed, this));
 	}
 
@@ -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)
 {