X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=f3d4a7aa527330d9d09718cfc6e8200295c0a5e8;hp=28efe5125f072386e7c4a6b4c00cf8ec348d214d;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hpb=54ef7357a87885ec329a25e758fb6b132816ec67

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 28efe5125..f3d4a7aa5 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -20,16 +20,18 @@
 
 #include "video_waveform_dialog.h"
 #include "video_waveform_plot.h"
-#include "control_film_viewer.h"
+#include "film_viewer.h"
 #include "wx_util.h"
+#include "static_text.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::bind;
 using boost::weak_ptr;
+using boost::shared_ptr;
 
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, ControlFilmViewer* viewer)
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
 	: wxDialog (
 		parent,
 		wxID_ANY,
@@ -66,11 +68,11 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 
 	wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
 	add_label_to_sizer (position, this, _("Image X position"), true);
-	_x_position = new wxStaticText (this, wxID_ANY, "");
+	_x_position = new StaticText (this, "");
 	_x_position->SetMinSize (wxSize (64, -1));
 	position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
 	add_label_to_sizer (position, this, _("component value"), true);
-	_value = new wxStaticText (this, wxID_ANY, "");
+	_value = new StaticText (this, "");
 	_value->SetMinSize (wxSize (64, -1));
 	position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
 	overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
@@ -106,7 +108,9 @@ VideoWaveformDialog::shown (wxShowEvent& ev)
 {
 	_plot->set_enabled (ev.IsShown ());
 	if (ev.IsShown ()) {
-		_viewer->slow_refresh ();
+		shared_ptr<FilmViewer> fv = _viewer.lock ();
+		DCPOMATIC_ASSERT (fv);
+		fv->slow_refresh ();
 	}
 }