Store subtitle language(s) in Film, and allow setup of those

[dcpomatic.git] / src / wx / video_waveform_plot.h

diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index 7e9dbf70999691da6ca2ee793a2bae1c8814d3cc..f107f0399dcd21d97be622df483c6b9d1b9670d9 100644 (file)
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -35,7 +38,7 @@ class FilmViewer;
 class VideoWaveformPlot : public wxPanel
 {
 public:
-       VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, FilmViewer* viewer);
+       VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, boost::weak_ptr<FilmViewer> viewer);
 
        void set_enabled (bool e);
        void set_component (int c);
@@ -52,7 +55,7 @@ private:
        void paint ();
        void sized (wxSizeEvent &);
        void create_waveform ();
-       void set_image (boost::weak_ptr<PlayerVideo>);
+       void set_image (boost::shared_ptr<PlayerVideo>);
        void mouse_moved (wxMouseEvent &);
 
        boost::weak_ptr<const Film> _film;