Move sound output driver selection into new preferences tab.

4 files changed, 173 insertions, 127 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 98a1a1a8e..14948afe8 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -155,36 +155,6 @@ GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 }
 
 void
-GeneralPage::add_play_sound_controls (wxGridBagSizer* table, int& r)
-{
-	_sound = new CheckBox (_panel, _("Play sound via"));
-	table->Add (_sound, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	_sound_output = new wxChoice (_panel, wxID_ANY);
-	s->Add (_sound_output, 0);
-	_sound_output_details = new wxStaticText (_panel, wxID_ANY, wxT(""));
-	s->Add (_sound_output_details, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, DCPOMATIC_SIZER_X_GAP);
-	table->Add (s, wxGBPosition(r, 1));
-	++r;
-
-	wxFont font = _sound_output_details->GetFont();
-	font.SetStyle (wxFONTSTYLE_ITALIC);
-	font.SetPointSize (font.GetPointSize() - 1);
-	_sound_output_details->SetFont (font);
-
-	RtAudio audio (DCPOMATIC_RTAUDIO_API);
-	for (unsigned int i = 0; i < audio.getDeviceCount(); ++i) {
-		RtAudio::DeviceInfo dev = audio.getDeviceInfo (i);
-		if (dev.probed && dev.outputChannels > 0) {
-			_sound_output->Append (std_to_wx (dev.name));
-		}
-	}
-
-	_sound->Bind        (wxEVT_CHECKBOX, bind (&GeneralPage::sound_changed, this));
-	_sound_output->Bind (wxEVT_CHOICE,   bind (&GeneralPage::sound_output_changed, this));
-}
-
-void
 GeneralPage::add_update_controls (wxGridBagSizer* table, int& r)
 {
 	_check_for_updates = new CheckBox (_panel, _("Check for updates on startup"));
@@ -233,62 +203,6 @@ GeneralPage::config_changed ()
 	checked_set (_check_for_updates, config->check_for_updates ());
 	checked_set (_check_for_test_updates, config->check_for_test_updates ());
 
-	checked_set (_sound, config->sound ());
-
-	optional<string> const current_so = get_sound_output ();
-	optional<string> configured_so;
-
-	if (config->sound_output()) {
-		configured_so = config->sound_output().get();
-	} else {
-		/* No configured output means we should use the default */
-		RtAudio audio (DCPOMATIC_RTAUDIO_API);
-		try {
-			configured_so = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
-		} catch (RtAudioError& e) {
-			/* Probably no audio devices at all */
-		}
-	}
-
-	if (configured_so && current_so != configured_so) {
-		/* Update _sound_output with the configured value */
-		unsigned int i = 0;
-		while (i < _sound_output->GetCount()) {
-			if (_sound_output->GetString(i) == std_to_wx(*configured_so)) {
-				_sound_output->SetSelection (i);
-				break;
-			}
-			++i;
-		}
-	}
-
-	RtAudio audio (DCPOMATIC_RTAUDIO_API);
-
-	map<int, wxString> apis;
-	apis[RtAudio::MACOSX_CORE]    = _("CoreAudio");
-	apis[RtAudio::WINDOWS_ASIO]   = _("ASIO");
-	apis[RtAudio::WINDOWS_DS]     = _("Direct Sound");
-	apis[RtAudio::WINDOWS_WASAPI] = _("WASAPI");
-	apis[RtAudio::UNIX_JACK]      = _("JACK");
-	apis[RtAudio::LINUX_ALSA]     = _("ALSA");
-	apis[RtAudio::LINUX_PULSE]    = _("PulseAudio");
-	apis[RtAudio::LINUX_OSS]      = _("OSS");
-	apis[RtAudio::RTAUDIO_DUMMY]  = _("Dummy");
-
-	int channels = 0;
-	if (configured_so) {
-		for (unsigned int i = 0; i < audio.getDeviceCount(); ++i) {
-			RtAudio::DeviceInfo info = audio.getDeviceInfo(i);
-			if (info.name == *configured_so && info.outputChannels > 0) {
-				channels = info.outputChannels;
-			}
-		}
-	}
-
-	_sound_output_details->SetLabel (
-		wxString::Format(_("%d channels on %s"), channels, apis[audio.getCurrentApi()])
-		);
-
 	setup_sensitivity ();
 }
 
@@ -297,19 +211,6 @@ GeneralPage::setup_sensitivity ()
 {
 	_language->Enable (_set_language->GetValue ());
 	_check_for_test_updates->Enable (_check_for_updates->GetValue ());
-	_sound_output->Enable (_sound->GetValue ());
-}
-
-/** @return Currently-selected preview sound output in the dialogue */
-optional<string>
-GeneralPage::get_sound_output ()
-{
-	int const sel = _sound_output->GetSelection ();
-	if (sel == wxNOT_FOUND) {
-		return optional<string> ();
-	}
-
-	return wx_to_std (_sound_output->GetString (sel));
 }
 
 void
@@ -346,24 +247,6 @@ GeneralPage::check_for_test_updates_changed ()
 	Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ());
 }
 
-void
-GeneralPage::sound_changed ()
-{
-	Config::instance()->set_sound (_sound->GetValue ());
-}
-
-void
-GeneralPage::sound_output_changed ()
-{
-	RtAudio audio (DCPOMATIC_RTAUDIO_API);
-	optional<string> const so = get_sound_output();
-	if (!so || *so == audio.getDeviceInfo(audio.getDefaultOutputDevice()).name) {
-		Config::instance()->unset_sound_output ();
-	} else {
-		Config::instance()->set_sound_output (*so);
-	}
-}
-
 CertificateChainEditor::CertificateChainEditor (
 	wxWindow* parent,
 	wxString title,
@@ -965,3 +848,144 @@ KeysPage::export_decryption_certificate ()
 
 	d->Destroy ();
 }
+
+wxString
+SoundPage::GetName () const
+{
+	return _("Sound");
+}
+
+void
+SoundPage::setup ()
+{
+	wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
+
+	int r = 0;
+
+	_sound = new CheckBox (_panel, _("Play sound via"));
+	table->Add (_sound, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+	_sound_output = new wxChoice (_panel, wxID_ANY);
+	s->Add (_sound_output, 0);
+	_sound_output_details = new wxStaticText (_panel, wxID_ANY, wxT(""));
+	s->Add (_sound_output_details, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, DCPOMATIC_SIZER_X_GAP);
+	table->Add (s, wxGBPosition(r, 1));
+	++r;
+
+	wxFont font = _sound_output_details->GetFont();
+	font.SetStyle (wxFONTSTYLE_ITALIC);
+	font.SetPointSize (font.GetPointSize() - 1);
+	_sound_output_details->SetFont (font);
+
+	RtAudio audio (DCPOMATIC_RTAUDIO_API);
+	for (unsigned int i = 0; i < audio.getDeviceCount(); ++i) {
+		RtAudio::DeviceInfo dev = audio.getDeviceInfo (i);
+		if (dev.probed && dev.outputChannels > 0) {
+			_sound_output->Append (std_to_wx (dev.name));
+		}
+	}
+
+	_sound->Bind        (wxEVT_CHECKBOX, bind (&SoundPage::sound_changed, this));
+	_sound_output->Bind (wxEVT_CHOICE,   bind (&SoundPage::sound_output_changed, this));
+}
+
+void
+SoundPage::sound_changed ()
+{
+	Config::instance()->set_sound (_sound->GetValue ());
+}
+
+void
+SoundPage::sound_output_changed ()
+{
+	RtAudio audio (DCPOMATIC_RTAUDIO_API);
+	optional<string> const so = get_sound_output();
+	if (!so || *so == audio.getDeviceInfo(audio.getDefaultOutputDevice()).name) {
+		Config::instance()->unset_sound_output ();
+	} else {
+		Config::instance()->set_sound_output (*so);
+	}
+}
+
+void
+SoundPage::config_changed ()
+{
+	Config* config = Config::instance ();
+
+	checked_set (_sound, config->sound ());
+
+	optional<string> const current_so = get_sound_output ();
+	optional<string> configured_so;
+
+	if (config->sound_output()) {
+		configured_so = config->sound_output().get();
+	} else {
+		/* No configured output means we should use the default */
+		RtAudio audio (DCPOMATIC_RTAUDIO_API);
+		try {
+			configured_so = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
+		} catch (RtAudioError& e) {
+			/* Probably no audio devices at all */
+		}
+	}
+
+	if (configured_so && current_so != configured_so) {
+		/* Update _sound_output with the configured value */
+		unsigned int i = 0;
+		while (i < _sound_output->GetCount()) {
+			if (_sound_output->GetString(i) == std_to_wx(*configured_so)) {
+				_sound_output->SetSelection (i);
+				break;
+			}
+			++i;
+		}
+	}
+
+	RtAudio audio (DCPOMATIC_RTAUDIO_API);
+
+	map<int, wxString> apis;
+	apis[RtAudio::MACOSX_CORE]    = _("CoreAudio");
+	apis[RtAudio::WINDOWS_ASIO]   = _("ASIO");
+	apis[RtAudio::WINDOWS_DS]     = _("Direct Sound");
+	apis[RtAudio::WINDOWS_WASAPI] = _("WASAPI");
+	apis[RtAudio::UNIX_JACK]      = _("JACK");
+	apis[RtAudio::LINUX_ALSA]     = _("ALSA");
+	apis[RtAudio::LINUX_PULSE]    = _("PulseAudio");
+	apis[RtAudio::LINUX_OSS]      = _("OSS");
+	apis[RtAudio::RTAUDIO_DUMMY]  = _("Dummy");
+
+	int channels = 0;
+	if (configured_so) {
+		for (unsigned int i = 0; i < audio.getDeviceCount(); ++i) {
+			RtAudio::DeviceInfo info = audio.getDeviceInfo(i);
+			if (info.name == *configured_so && info.outputChannels > 0) {
+				channels = info.outputChannels;
+			}
+		}
+	}
+
+	_sound_output_details->SetLabel (
+		wxString::Format(_("%d channels on %s"), channels, apis[audio.getCurrentApi()])
+		);
+
+	setup_sensitivity ();
+}
+
+void
+SoundPage::setup_sensitivity ()
+{
+	_sound_output->Enable (_sound->GetValue());
+}
+
+/** @return Currently-selected preview sound output in the dialogue */
+optional<string>
+SoundPage::get_sound_output ()
+{
+	int const sel = _sound_output->GetSelection ();
+	if (sel == wxNOT_FOUND) {
+		return optional<string> ();
+	}
+
+	return wx_to_std (_sound_output->GetString (sel));
+}
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index ac90cd42d..1a9d97a43 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -89,25 +89,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;
-	wxStaticText* _sound_output_details;
 	wxCheckBox* _check_for_updates;
 	wxCheckBox* _check_for_test_updates;
 };
@@ -185,4 +178,34 @@ 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 ();
+
+	wxCheckBox* _sound;
+	wxChoice* _sound_output;
+	wxStaticText* _sound_output_details;
+};
+
 #endif
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 1c5a9e3f6..f586672a8 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -116,8 +116,6 @@ private:
 		table->Add (export_cinemas, wxGBPosition (r, 2));
 		++r;
 
-		add_play_sound_controls (table, r);
-
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 		_analyse_ebur128 = new CheckBox (_panel, _("Find integrated loudness, true peak and loudness range when analysing audio"));
 		table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2));
@@ -1678,6 +1676,7 @@ create_full_config_dialog ()
 #endif
 
 	e->AddPage (new FullGeneralPage (ps, border));
+	e->AddPage (new SoundPage (ps, border));
 	e->AddPage (new DefaultsPage (ps, border));
 	e->AddPage (new EncodingServersPage (ps, border));
 	e->AddPage (new KeysPage (ps, border));
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 20ddde992..508b91746 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -85,7 +85,6 @@ private:
 
 		int r = 0;
 		add_language_controls (table, r);
-		add_play_sound_controls (table, r);
 		add_update_controls (table, r);
 
 		add_label_to_sizer (table, _panel, _("Start player as"), true, wxGBPosition(r, 0));
@@ -684,6 +683,7 @@ create_player_config_dialog ()
 #endif
 
 	e->AddPage (new PlayerGeneralPage(wxSize(-1, 500), border));
+	e->AddPage (new SoundPage(ps, border));
 	e->AddPage (new LocationsPage(ps, border));
 	e->AddPage (new KeysPage(ps, border));
 #ifdef DCPOMATIC_VARIANT_SWAROOP