X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.h;h=a202ad65b1d6be3ef0bf9c81be3cd51730b13caf;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hp=2c077c9d1207718ad5af2b61a79a5d488b63dc8a;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 2c077c9d1..a202ad65b 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,26 +18,33 @@
 
 */
 
-#include "lib/film.h"
+
 #include "lib/audio_analysis.h"
+#include "lib/film.h"
 #include "lib/playlist.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 class AudioPlot;
+class FilmViewer;
 class Film;
 
+
 class AudioDialog : public wxDialog
 {
 public:
-	AudioDialog (wxWindow* parent, boost::shared_ptr<Film> film, boost::shared_ptr<Content> content = boost::shared_ptr<Content> ());
+	AudioDialog (wxWindow* parent, std::shared_ptr<Film> film, std::weak_ptr<FilmViewer> viewer, std::shared_ptr<Content> content = std::shared_ptr<Content>());
 
-	bool Show (bool show = true);
+	bool Show (bool show = true) override;
 
-	void set_cursor (boost::optional<DCPTime> time, boost::optional<float> db);
+	void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
 
 private:
+	void film_change (ChangeType, Film::Property);
 	void content_change (ChangeType, int);
 	void channel_clicked (wxCommandEvent &);
 	void type_clicked (wxCommandEvent &);
@@ -45,21 +52,26 @@ private:
 	void try_to_load_analysis ();
 	void analysis_finished ();
 	void setup_statistics ();
+	void show_or_hide_channel_checkboxes ();
 
-	boost::shared_ptr<AudioAnalysis> _analysis;
-	boost::weak_ptr<Film> _film;
-	boost::weak_ptr<Content> _content;
+	std::shared_ptr<AudioAnalysis> _analysis;
+	std::weak_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
+	/** content to analyse, or 0 to analyse all the film's content */
+	std::weak_ptr<Content> _content;
 	int _channels;
-	boost::shared_ptr<const Playlist> _playlist;
+	std::shared_ptr<const Playlist> _playlist;
 	wxStaticText* _cursor;
 	AudioPlot* _plot;
 	wxStaticText* _sample_peak;
 	wxStaticText* _true_peak;
 	wxStaticText* _integrated_loudness;
 	wxStaticText* _loudness_range;
+	wxStaticText* _leqm;
 	wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
 	wxSlider* _smoothing;
 	boost::signals2::scoped_connection _film_connection;
+	boost::signals2::scoped_connection _film_content_connection;
 	boost::signals2::scoped_connection _analysis_finished_connection;
 };