Merge master.

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

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 8a6402c9ef27235ffca22f6c966e721c5b4a270d..2ba5a9ffc051de25e29200d4b28f952cdaff9db8 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -17,9 +17,11 @@
 
 */
 
+#include "lib/audio_mapping.h"
 #include "film_editor_panel.h"
+#include "content_widget.h"
 
-class wxSpinCtrl;
+class wxSpinCtrlDouble;
 class wxButton;
 class wxChoice;
 class wxStaticText;
@@ -32,20 +34,20 @@ public:
        AudioPanel (FilmEditor *);
 
        void film_changed (Film::Property);
-       void film_content_changed (boost::shared_ptr<Content>, int);
+       void film_content_changed (int);
+       void content_selection_changed ();
        
 private:
-       void gain_changed (wxCommandEvent &);
-       void gain_calculate_button_clicked (wxCommandEvent &);
-       void show_clicked (wxCommandEvent &);
-       void delay_changed (wxCommandEvent &);
-       void stream_changed (wxCommandEvent &);
+       void gain_calculate_button_clicked ();
+       void show_clicked ();
+       void stream_changed ();
        void mapping_changed (AudioMapping);
+       void setup_stream_description ();
 
-       wxSpinCtrl* _gain;
+       ContentSpinCtrlDouble<AudioContent>* _gain;
        wxButton* _gain_calculate_button;
        wxButton* _show;
-       wxSpinCtrl* _delay;
+       ContentSpinCtrl<AudioContent>* _delay;
        wxChoice* _stream;
        wxStaticText* _description;
        AudioMappingView* _mapping;