summaryrefslogtreecommitdiff
path: root/src/wx/video_waveform_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-11 01:25:16 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-11 11:58:15 +0100
commitc370a1f38215f6461cf4366e6885757e7aa2b96a (patch)
tree6d660895988652297260c2434115b903032bc60d /src/wx/video_waveform_dialog.cc
parent23b60bec13fa8f0b88c34922a169aa0084d99476 (diff)
Separate out management of controls.
Diffstat (limited to 'src/wx/video_waveform_dialog.cc')
-rw-r--r--src/wx/video_waveform_dialog.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 28efe5125..6b0ed4410 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -20,7 +20,7 @@
#include "video_waveform_dialog.h"
#include "video_waveform_plot.h"
-#include "control_film_viewer.h"
+#include "film_viewer.h"
#include "wx_util.h"
#include <boost/bind.hpp>
#include <iostream>
@@ -28,8 +28,9 @@
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,
@@ -106,7 +107,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 ();
}
}