projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to specify a list of servers (#1104).
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index b4257057dd6c4a2741301510fa478ddd85911992..41be90b79ed6d4074b49a0a55bc93bf1d02c8583 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-1,27
+1,29
@@
/*
/*
- 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#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,9
+31,9
@@
class Film;
class AudioDialog : public wxDialog
{
public:
class AudioDialog : public wxDialog
{
public:
- AudioDialog (wxWindow
*
);
+ AudioDialog (wxWindow
* parent, boost::shared_ptr<Film> film, boost::shared_ptr<Content> content = boost::shared_ptr<Content> ()
);
-
void set_content (boost::shared_ptr<AudioContent>
);
+
bool Show (bool show = true
);
private:
void content_changed (int);
private:
void content_changed (int);
@@
-40,12
+42,21
@@
private:
void smoothing_changed ();
void try_to_load_analysis ();
void analysis_finished ();
void smoothing_changed ();
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;
+ boost::weak_ptr<Content> _content;
+ 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;
};
boost::signals2::scoped_connection _analysis_finished_connection;
};