Fix TimelineTimeAxisView::bbox() to be correct.

[dcpomatic.git] / src / wx / video_waveform_dialog.cc

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 3603c5dd29ba5e8bd00db4c1ee77e5717edfe66c..73ccc82df67abb80b6054d7584b289bd65c45aed 100644 (file)
--- 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 <boost/bind.hpp>
-#include <iostream>
+#include <boost/bind/bind.hpp>
+
 
-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<const Film> film, weak_ptr<FilmViewer> viewer)
+VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr<const Film> 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<FilmViewer> fv = _viewer.lock ();
-               DCPOMATIC_ASSERT (fv);
-               fv->slow_refresh ();
+               _viewer.slow_refresh();
        }
 }