Emit no audio from DCPs if none is mapped

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 9edabf8ec70b5cc605bfd932c07fb2b1e9083db0..f3d80b5e5ec99b918d5c15382a86246ecb4769e3 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -18,12 +18,13 @@
 
 */
 
-#include "lib/util.h"
+
 #include "lib/audio_analysis.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/constants.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <vector>
 
@@ -33,7 +34,7 @@ class FilmViewer;
 class AudioPlot : public wxPanel
 {
 public:
-       explicit AudioPlot (wxWindow *, std::weak_ptr<FilmViewer> viewer);
+       explicit AudioPlot (wxWindow *, FilmViewer& viewer);
 
        void set_analysis (std::shared_ptr<AudioAnalysis>);
        void set_channel_visible (int c, bool v);
@@ -77,7 +78,7 @@ private:
        void mouse_moved (wxMouseEvent& ev);
        void mouse_leave (wxMouseEvent& ev);
 
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        std::shared_ptr<AudioAnalysis> _analysis;
        bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
        bool _type_visible[AudioPoint::COUNT];