projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge TO_PORT.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index 62811091a8b9c14ce0c7b8eeb5295c4836cc04b9..b277852928d19f53e3849464a0541d24c65288c3 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-37,14
+37,15
@@
private:
void content_changed (int);
void channel_clicked (wxCommandEvent &);
void type_clicked (wxCommandEvent &);
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 analysis_finished ();
boost::shared_ptr<AudioContent> _content;
AudioPlot* _plot;
void try_to_load_analysis ();
void analysis_finished ();
boost::shared_ptr<AudioContent> _content;
AudioPlot* _plot;
- wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+ wxCheckBox* _channel_checkbox[MAX_
DCP_
AUDIO_CHANNELS];
wxCheckBox* _type_checkbox[AudioPoint::COUNT];
wxSlider* _smoothing;
boost::signals2::scoped_connection _content_changed_connection;
wxCheckBox* _type_checkbox[AudioPoint::COUNT];
wxSlider* _smoothing;
boost::signals2::scoped_connection _content_changed_connection;
+ boost::signals2::scoped_connection _analysis_finished_connection;
};
};