projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move _state_timer into VideoView.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index 6d44285463ba0823081a73b6e53695add2a0c0f0..e866aca3f83a8823d0a52e76edd8e1a07440782d 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-35,10
+35,11
@@
public:
bool Show (bool show = true);
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:
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 ();
@@
-61,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;
};