X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=565ecf1c4f738c026aa0901a1bee0256335b5885;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=3b8762d8b073238f7d01b9908a9344ffcbeef657;hpb=35841948169c44863f9fb39cdee4dccf0463846a;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 3b8762d8b..565ecf1c4 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -44,6 +44,8 @@
 #include <boost/foreach.hpp>
 #include <iostream>
 
+class AudioMappingView;
+
 class Page
 {
 public:
@@ -89,24 +91,18 @@ public:
 
 protected:
 	void add_language_controls (wxGridBagSizer* table, int& r);
-	void add_play_sound_controls (wxGridBagSizer* table, int& r);
 	void add_update_controls (wxGridBagSizer* table, int& r);
 	virtual void config_changed ();
 
 private:
 	void setup_sensitivity ();
-        boost::optional<std::string> get_sound_output ();
 	void set_language_changed ();
 	void language_changed ();
 	void check_for_updates_changed ();
 	void check_for_test_updates_changed ();
-	void sound_changed ();
-        void sound_output_changed ();
 
 	wxCheckBox* _set_language;
 	wxChoice* _language;
-	wxCheckBox* _sound;
-	wxChoice* _sound_output;
 	wxCheckBox* _check_for_updates;
 	wxCheckBox* _check_for_test_updates;
 };
@@ -120,7 +116,7 @@ public:
 		int border,
 		boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
 		boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
-		boost::function<bool (void)> nag_remake
+		boost::function<bool (void)> nag_alter
 		);
 
 	void add_button (wxWindow* button);
@@ -135,6 +131,7 @@ private:
 	void update_private_key ();
 	void import_private_key ();
 	void export_private_key ();
+	void export_chain ();
 
 	wxListCtrl* _certificates;
 	wxButton* _add_certificate;
@@ -144,12 +141,13 @@ private:
 	wxStaticText* _private_key;
 	wxButton* _import_private_key;
 	wxButton* _export_private_key;
+	wxButton* _export_chain;
 	wxStaticText* _private_key_bad;
 	wxSizer* _sizer;
 	wxBoxSizer* _button_sizer;
 	boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
 	boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
-	boost::function<bool (void)> _nag_remake;
+	boost::function<bool (void)> _nag_alter;
 };
 
 class KeysPage : public StandardPage
@@ -173,9 +171,8 @@ private:
 	void setup ();
 
 	void export_decryption_certificate ();
-	void export_decryption_chain ();
 	void config_changed () {}
-	bool nag_remake_decryption_chain ();
+	bool nag_alter_decryption_chain ();
 	void decryption_advanced ();
 	void signing_advanced ();
 	void export_decryption_chain_and_key ();
@@ -183,4 +180,38 @@ private:
 };
 
 
+class SoundPage : public StandardPage
+{
+public:
+	SoundPage (wxSize panel_size, int border)
+		: StandardPage (panel_size, border)
+	{}
+
+	wxString GetName() const;
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
+private:
+
+	void setup ();
+	void config_changed ();
+        boost::optional<std::string> get_sound_output ();
+	void sound_changed ();
+	void sound_output_changed ();
+	void setup_sensitivity ();
+	void map_changed (AudioMapping m);
+	void reset_to_default ();
+
+	wxCheckBox* _sound;
+	wxChoice* _sound_output;
+	wxStaticText* _sound_output_details;
+	AudioMappingView* _map;
+	Button* _reset_to_default;
+};
+
 #endif