X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.h;h=2856cec4d230c0a294445912d39c4873115d311a;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=8a6402c9ef27235ffca22f6c966e721c5b4a270d;hpb=71cb2c8b03be7a246567631c637347d871c9c82d;p=dcpomatic.git

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 8a6402c9e..2856cec4d 100644
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -17,37 +17,35 @@
 
 */
 
-#include "film_editor_panel.h"
+#include "lib/audio_mapping.h"
+#include "content_sub_panel.h"
+#include "content_widget.h"
 
-class wxSpinCtrl;
+class wxSpinCtrlDouble;
 class wxButton;
 class wxChoice;
 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 (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 mapping_changed (AudioMapping);
+	void setup_description ();
 
-	wxSpinCtrl* _gain;
+	ContentSpinCtrlDouble<AudioContent>* _gain;
 	wxButton* _gain_calculate_button;
-	wxButton* _show;
-	wxSpinCtrl* _delay;
-	wxChoice* _stream;
-	wxStaticText* _description;
+	ContentSpinCtrl<AudioContent>* _delay;
 	AudioMappingView* _mapping;
-	AudioDialog* _audio_dialog;
+	wxStaticText* _description;
+
+	boost::signals2::scoped_connection _mapping_connection;
 };