X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.cc;h=866f5f568a528f2d769593bb16f23842f151dd08;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hp=c6fa883fa871c227b321dea92819d126998cd922;hpb=3b58fc434bb6933c1429a922fd7f56e70712257a;p=dcpomatic.git

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index c6fa883fa..866f5f568 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -38,12 +38,17 @@ using std::max;
 using std::string;
 using boost::weak_ptr;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
+
 int const VideoWaveformPlot::_vertical_margin = 8;
 int const VideoWaveformPlot::_pixel_values = 4096;
 int const VideoWaveformPlot::_x_axis_width = 52;
 
+
 VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
 	, _film (film)
@@ -187,18 +192,16 @@ note ()
 }
 
 void
-VideoWaveformPlot::set_image (weak_ptr<PlayerVideo> image)
+VideoWaveformPlot::set_image (shared_ptr<PlayerVideo> image)
 {
 	if (!_enabled) {
 		return;
 	}
 
-	shared_ptr<PlayerVideo> pv = image.lock ();
-	DCPOMATIC_ASSERT (pv);
 	/* We must copy the PlayerVideo here as we will call ::image() on it, potentially
 	   with a different pixel_format than was used when ::prepare() was called.
 	*/
-	_image = DCPVideo::convert_to_xyz (pv->shallow_copy(), boost::bind (&note));
+	_image = DCPVideo::convert_to_xyz (image->shallow_copy(), boost::bind(&note));
 	_dirty = true;
 	Refresh ();
 }