X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.h;h=fd0b1c3f7ce544412fe0f712a6a130521987d692;hb=48e51965d74cf2a2f2f6f4c5e9c349f1b1103e66;hp=db1d74f306393ceaf9860919aefe82434a92ea36;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index db1d74f30..fd0b1c3f7 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <wx/wx.h>
 #include "lib/film.h"
 #include "lib/audio_analysis.h"
+#include "lib/playlist.h"
+#include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
 class AudioPlot;
 class Film;
@@ -29,22 +30,32 @@ class Film;
 class AudioDialog : public wxDialog
 {
 public:
-	AudioDialog (wxWindow *);
+	AudioDialog (wxWindow *, boost::shared_ptr<Film> film, boost::shared_ptr<Content> content = boost::shared_ptr<Content> ());
 
-	void set_film (boost::shared_ptr<Film>);
+	bool Show (bool show = true);
 
 private:
-	void film_changed (Film::Property);
+	void content_changed (int);
 	void channel_clicked (wxCommandEvent &);
 	void type_clicked (wxCommandEvent &);
-	void smoothing_changed (wxScrollEvent &);
+	void smoothing_changed ();
 	void try_to_load_analysis ();
-
-	boost::shared_ptr<Film> _film;
+	void analysis_finished ();
+	void setup_statistics ();
+
+	boost::shared_ptr<AudioAnalysis> _analysis;
+	boost::weak_ptr<Film> _film;
+	boost::weak_ptr<Content> _content;
+	int _channels;
+	boost::shared_ptr<const Playlist> _playlist;
 	AudioPlot* _plot;
-	wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+	wxStaticText* _sample_peak;
+	wxStaticText* _true_peak;
+	wxStaticText* _integrated_loudness;
+	wxStaticText* _loudness_range;
+	wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
 	wxSlider* _smoothing;
-	boost::signals2::scoped_connection _film_changed_connection;
-	boost::signals2::scoped_connection _film_audio_analysis_succeeded_connection;
+	boost::signals2::scoped_connection _film_connection;
+	boost::signals2::scoped_connection _analysis_finished_connection;
 };