X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.h;h=a94e98e32f4d5b6161a863aa104e721650cb4495;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=41be90b79ed6d4074b49a0a55bc93bf1d02c8583;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 41be90b79..a94e98e32 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.
 
@@ -21,42 +21,54 @@
 #include "lib/film.h"
 #include "lib/audio_analysis.h"
 #include "lib/playlist.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_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);
 
+	void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
+
 private:
-	void content_changed (int);
+	void film_change (ChangeType, int);
+	void content_change (ChangeType, int);
 	void channel_clicked (wxCommandEvent &);
 	void type_clicked (wxCommandEvent &);
 	void smoothing_changed ();
 	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;
 };