projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: allowed-shows state in playlist.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index 0f791dc160b0df41571c69378cc774195e3af919..e866aca3f83a8823d0a52e76edd8e1a07440782d 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
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/>.
*/
*/
@@
-30,12
+31,15
@@
class Film;
class AudioDialog : public wxDialog
{
public:
class AudioDialog : public wxDialog
{
public:
- AudioDialog (wxWindow
*, boost::shared_ptr<Film> film, boost::shared_ptr<AudioContent> content = boost::shared_ptr<Audio
Content> ());
+ AudioDialog (wxWindow
* parent, boost::shared_ptr<Film> film, boost::shared_ptr<Content> content = boost::shared_ptr<
Content> ());
bool Show (bool show = true);
bool Show (bool show = true);
+ void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
+
private:
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 channel_clicked (wxCommandEvent &);
void type_clicked (wxCommandEvent &);
void smoothing_changed ();
@@
-45,8
+49,10
@@
private:
boost::shared_ptr<AudioAnalysis> _analysis;
boost::weak_ptr<Film> _film;
boost::shared_ptr<AudioAnalysis> _analysis;
boost::weak_ptr<Film> _film;
+ boost::weak_ptr<Content> _content;
int _channels;
boost::shared_ptr<const Playlist> _playlist;
int _channels;
boost::shared_ptr<const Playlist> _playlist;
+ wxStaticText* _cursor;
AudioPlot* _plot;
wxStaticText* _sample_peak;
wxStaticText* _true_peak;
AudioPlot* _plot;
wxStaticText* _sample_peak;
wxStaticText* _true_peak;
@@
-56,5
+62,6
@@
private:
wxCheckBox* _type_checkbox[AudioPoint::COUNT];
wxSlider* _smoothing;
boost::signals2::scoped_connection _film_connection;
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;
};
boost::signals2::scoped_connection _analysis_finished_connection;
};