Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

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

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 38f474afda0200de1f9f7385a7f1a5694d3bf063..34c174cf46cdf711f5469a9889377dcad47c3986 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -35,7 +35,7 @@ public:
 
        bool Show (bool show = true);
 
-       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, int);
@@ -49,6 +49,7 @@ private:
 
        boost::shared_ptr<AudioAnalysis> _analysis;
        boost::weak_ptr<Film> _film;
+       /** content to analyse, or 0 to analyse all the film's content */
        boost::weak_ptr<Content> _content;
        int _channels;
        boost::shared_ptr<const Playlist> _playlist;
@@ -58,6 +59,7 @@ private:
        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;