projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
wx
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index d5821d26abd3446844bff8e8aae1b3022901f187..2856cec4d230c0a294445912d39c4873115d311a 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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
@@
-26,7
+26,6
@@
class wxButton;
class wxChoice;
class wxStaticText;
class AudioMappingView;
class wxChoice;
class wxStaticText;
class AudioMappingView;
-class AudioDialog;
class AudioPanel : public ContentSubPanel
{
class AudioPanel : public ContentSubPanel
{
@@
-36,21
+35,17
@@
public:
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
-
+
private:
void gain_calculate_button_clicked ();
private:
void gain_calculate_button_clicked ();
- void show_clicked ();
- void stream_changed ();
void mapping_changed (AudioMapping);
void mapping_changed (AudioMapping);
- void processor_changed ();
- void setup_processors ();
+ void setup_description ();
ContentSpinCtrlDouble<AudioContent>* _gain;
wxButton* _gain_calculate_button;
ContentSpinCtrlDouble<AudioContent>* _gain;
wxButton* _gain_calculate_button;
- wxButton* _show;
ContentSpinCtrl<AudioContent>* _delay;
ContentSpinCtrl<AudioContent>* _delay;
- wxChoice* _stream;
- wxChoice* _processor;
AudioMappingView* _mapping;
AudioMappingView* _mapping;
- AudioDialog* _audio_dialog;
+ wxStaticText* _description;
+
+ boost::signals2::scoped_connection _mapping_connection;
};
};