projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
KDM dialog sizing hack.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index c69baf282fc1f893a2a992d0b2cff717d5a6f090..0f791dc160b0df41571c69378cc774195e3af919 100644
(file)
--- 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
-2015
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
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/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;
class AudioPlot;
class Film;
@@
-29,21
+30,31
@@
class Film;
class AudioDialog : public wxDialog
{
public:
class AudioDialog : public wxDialog
{
public:
- AudioDialog (wxWindow *);
+ AudioDialog (wxWindow *
, boost::shared_ptr<Film> film, boost::shared_ptr<AudioContent> content = boost::shared_ptr<AudioContent> ()
);
-
void set_content (boost::shared_ptr<AudioContent>
);
+
bool Show (bool show = true
);
private:
void content_changed (int);
void channel_clicked (wxCommandEvent &);
void type_clicked (wxCommandEvent &);
private:
void content_changed (int);
void channel_clicked (wxCommandEvent &);
void type_clicked (wxCommandEvent &);
- void smoothing_changed (
wxScrollEvent &
);
+ void smoothing_changed ();
void try_to_load_analysis ();
void try_to_load_analysis ();
+ void analysis_finished ();
+ void setup_statistics ();
- boost::shared_ptr<AudioContent> _content;
+ boost::shared_ptr<AudioAnalysis> _analysis;
+ boost::weak_ptr<Film> _film;
+ int _channels;
+ boost::shared_ptr<const Playlist> _playlist;
AudioPlot* _plot;
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;
wxCheckBox* _type_checkbox[AudioPoint::COUNT];
wxSlider* _smoothing;
- boost::signals2::scoped_connection _content_changed_connection;
+ boost::signals2::scoped_connection _film_connection;
+ boost::signals2::scoped_connection _analysis_finished_connection;
};
};