X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fstandard_controls.cc;h=de63c2fce8da83ab32e74aa6708ff3eca3c07960;hb=c7044a1b444c2e5e7659bf5d34ed5ac73f5a6271;hp=cef06d29cf695c1af92e8e9e1255b2fc7ac2b2f0;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git

diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index cef06d29c..de63c2fce 100644
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -21,17 +21,17 @@
 
 #include "film_viewer.h"
 #include "standard_controls.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
 
 
-StandardControls::StandardControls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
+StandardControls::StandardControls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
 	: Controls (parent, viewer, editor_controls)
 	, _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
 {
@@ -66,15 +66,14 @@ StandardControls::play_clicked ()
 void
 StandardControls::check_play_state ()
 {
-	auto viewer = _viewer.lock ();
-	if (!_film || _film->video_frame_rate() == 0 || !viewer) {
+	if (!_film || _film->video_frame_rate() == 0) {
 		return;
 	}
 
 	if (_play_button->GetValue()) {
-		viewer->start ();
+		_viewer.start();
 	} else {
-		viewer->stop ();
+		_viewer.stop();
 	}
 }