Merge master.

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

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index fa18415bdb345fccc09e78a785077e2fa2ffe382..b0218575a7f0f12ca6c5a6b59f3107626e79dbe7 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);
@@ -42,14 +42,16 @@ private:
        void show_clicked ();
        void stream_changed ();
        void mapping_changed (AudioMapping);
+       void processor_changed ();
+       void setup_processors ();
        void setup_description ();
-       void setup_stream_description ();
 
        ContentSpinCtrlDouble<AudioContent>* _gain;
        wxButton* _gain_calculate_button;
        wxButton* _show;
        ContentSpinCtrl<AudioContent>* _delay;
        wxChoice* _stream;
+       wxChoice* _processor;
        wxStaticText* _stream_description;
        AudioMappingView* _mapping;
        wxStaticText* _description;