projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
wx
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index 8cb94f0fa6efdf6ad8ba4f7797946962abf2b98c..d5821d26abd3446844bff8e8aae1b3022901f187 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-18,39
+18,39
@@
*/
#include "lib/audio_mapping.h"
*/
#include "lib/audio_mapping.h"
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
+#include "content_widget.h"
-class wxSpinCtrl;
+class wxSpinCtrl
Double
;
class wxButton;
class wxChoice;
class wxStaticText;
class AudioMappingView;
class AudioDialog;
class wxButton;
class wxChoice;
class wxStaticText;
class AudioMappingView;
class AudioDialog;
-class AudioPanel : public
FilmEditor
Panel
+class AudioPanel : public
ContentSub
Panel
{
public:
{
public:
- AudioPanel (
FilmEditor
*);
+ AudioPanel (
ContentPanel
*);
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
private:
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
private:
- void gain_changed ();
void gain_calculate_button_clicked ();
void show_clicked ();
void gain_calculate_button_clicked ();
void show_clicked ();
- void delay_changed ();
void stream_changed ();
void mapping_changed (AudioMapping);
void stream_changed ();
void mapping_changed (AudioMapping);
- void setup_stream_description ();
+ void processor_changed ();
+ void setup_processors ();
-
wxSpinCtrl
* _gain;
+
ContentSpinCtrlDouble<AudioContent>
* _gain;
wxButton* _gain_calculate_button;
wxButton* _show;
wxButton* _gain_calculate_button;
wxButton* _show;
-
wxSpinCtrl
* _delay;
+
ContentSpinCtrl<AudioContent>
* _delay;
wxChoice* _stream;
wxChoice* _stream;
- wx
StaticText* _description
;
+ wx
Choice* _processor
;
AudioMappingView* _mapping;
AudioDialog* _audio_dialog;
};
AudioMappingView* _mapping;
AudioDialog* _audio_dialog;
};