X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=73ccc82df67abb80b6054d7584b289bd65c45aed;hb=refs%2Fheads%2F2252-multi-stream;hp=3603c5dd29ba5e8bd00db4c1ee77e5717edfe66c;hpb=1a7c50245309bb0b99001940b2203a267de942ca;p=dcpomatic.git diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index 3603c5dd2..73ccc82df 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -18,24 +18,24 @@ */ + #include "video_waveform_dialog.h" #include "video_waveform_plot.h" #include "film_viewer.h" #include "wx_util.h" #include "static_text.h" -#include -#include +#include + -using std::cout; using boost::bind; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr film, weak_ptr viewer) +VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr film, FilmViewer& viewer) : wxDialog ( parent, wxID_ANY, @@ -112,9 +112,7 @@ VideoWaveformDialog::shown (wxShowEvent& ev) { _plot->set_enabled (ev.IsShown ()); if (ev.IsShown ()) { - shared_ptr fv = _viewer.lock (); - DCPOMATIC_ASSERT (fv); - fv->slow_refresh (); + _viewer.slow_refresh(); } }