Merge master.

[dcpomatic.git] / src / wx / audio_panel.h

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 2ba5a9ffc051de25e29200d4b28f952cdaff9db8..9a9d326985975bc60f98216f85f92f02d0d31a76 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -18,7 +18,7 @@
 */
 
 #include "lib/audio_mapping.h"
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 #include "content_widget.h"
 
 class wxSpinCtrlDouble;
@@ -28,10 +28,10 @@ class wxStaticText;
 class AudioMappingView;
 class AudioDialog;
 
-class AudioPanel : public FilmEditorPanel
+class AudioPanel : public ContentSubPanel
 {
 public:
-       AudioPanel (FilmEditor *);
+       AudioPanel (ContentPanel *);
 
        void film_changed (Film::Property);
        void film_content_changed (int);
@@ -43,6 +43,8 @@ private:
        void stream_changed ();
        void mapping_changed (AudioMapping);
        void setup_stream_description ();
+       void processor_changed ();
+       void setup_processors ();
 
        ContentSpinCtrlDouble<AudioContent>* _gain;
        wxButton* _gain_calculate_button;
@@ -50,6 +52,7 @@ private:
        ContentSpinCtrl<AudioContent>* _delay;
        wxChoice* _stream;
        wxStaticText* _description;
+       wxChoice* _processor;
        AudioMappingView* _mapping;
        AudioDialog* _audio_dialog;
 };