X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=40bb4340761c432fb6a13cb61a5ff00845852e25;hb=ba9fb85168d004d7643dc02f911fd173a136758b;hp=a9cf7da07ab5cf2ab3603905904d50dcecadc401;hpb=fdc416faa317106d05be8fe5226ded84d8347d99;p=dcpomatic.git

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index a9cf7da07..40bb43407 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,9 @@
 #include "check_box.h"
 #include "nag_dialog.h"
 #include "dcpomatic_button.h"
+#include "audio_mapping_view.h"
+#include <dcp/raw_convert.h>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -33,6 +36,9 @@ using boost::bind;
 using boost::optional;
 using boost::shared_ptr;
 using boost::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static
 bool
@@ -50,6 +56,14 @@ Page::Page (wxSize panel_size, int border)
 	_config_connection = Config::instance()->Changed.connect (bind (&Page::config_changed_wrapper, this));
 }
 
+
+wxWindow*
+Page::CreateWindow (wxWindow* parent)
+{
+	return create_window (parent);
+}
+
+
 wxWindow*
 Page::create_window (wxWindow* parent)
 {
@@ -81,37 +95,20 @@ Page::window_destroyed ()
 }
 
 
-StockPage::StockPage (Kind kind, wxSize panel_size, int border)
-	: wxStockPreferencesPage (kind)
-	, Page (panel_size, border)
-{
-
-}
-
-wxWindow*
-StockPage::CreateWindow (wxWindow* parent)
-{
-	return create_window (parent);
-}
-
-StandardPage::StandardPage (wxSize panel_size, int border)
+GeneralPage::GeneralPage (wxSize panel_size, int border)
 	: Page (panel_size, border)
 {
 
 }
 
-wxWindow*
-StandardPage::CreateWindow (wxWindow* parent)
-{
-	return create_window (parent);
-}
 
-GeneralPage::GeneralPage (wxSize panel_size, int border)
-	: StockPage (Kind_General, panel_size, border)
+wxString
+GeneralPage::GetName () const
 {
-
+	return _("General");
 }
 
+
 void
 GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 {
@@ -134,6 +131,7 @@ GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 	languages.push_back (make_pair ("Português do Brasil", "pt_BR"));
 	languages.push_back (make_pair ("Svenska", "sv_SE"));
 	languages.push_back (make_pair ("Slovenský jazyk", "sk_SK"));
+	languages.push_back (make_pair ("Türkçe", "tr_TR"));
 	languages.push_back (make_pair ("українська мова", "uk_UA"));
 	checked_set (_language, languages);
 	table->Add (_language, wxGBPosition (r, 1));
@@ -152,27 +150,6 @@ GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 	_language->Bind     (wxEVT_CHOICE,   bind (&GeneralPage::language_changed,     this));
 }
 
-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);
-	_sound_output = new wxChoice (_panel, wxID_ANY);
-	table->Add (_sound_output, wxGBPosition (r, 1));
-	++r;
-
-	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)
 {
@@ -222,35 +199,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;
-		}
-	}
-
 	setup_sensitivity ();
 }
 
@@ -259,19 +207,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
@@ -308,50 +243,23 @@ 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,
 	int border,
 	function<void (shared_ptr<dcp::CertificateChain>)> set,
 	function<shared_ptr<const dcp::CertificateChain> (void)> get,
-	function<bool (void)> nag_remake
+	function<bool (void)> nag_alter
 	)
 	: wxDialog (parent, wxID_ANY, title)
 	, _set (set)
 	, _get (get)
-	, _nag_remake (nag_remake)
+	, _nag_alter (nag_alter)
 {
-	wxFont subheading_font (*wxNORMAL_FONT);
-	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
-
 	_sizer = new wxBoxSizer (wxVERTICAL);
 
-	{
-		wxStaticText* m = new StaticText (this, title);
-		m->SetFont (subheading_font);
-		_sizer->Add (m, 0, wxALL, border);
-	}
-
 	wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
-	_sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, border);
+	_sizer->Add (certificates_sizer, 0, wxALL, border);
 
 	_certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL);
 
@@ -381,11 +289,13 @@ CertificateChainEditor::CertificateChainEditor (
 	{
 		wxSizer* s = new wxBoxSizer (wxVERTICAL);
 		_add_certificate = new Button (this, _("Add..."));
-		s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+		s->Add (_add_certificate, 1, wxTOP | wxBOTTOM | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
 		_remove_certificate = new Button (this, _("Remove"));
-		s->Add (_remove_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-		_export_certificate = new Button (this, _("Export"));
-		s->Add (_export_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+		s->Add (_remove_certificate, 1, wxTOP | wxBOTTOM | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
+		_export_certificate = new Button (this, _("Export certificate..."));
+		s->Add (_export_certificate, 1, wxTOP | wxBOTTOM | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
+		_export_chain = new Button (this, _("Export chain..."));
+		s->Add (_export_chain, 1, wxTOP | wxBOTTOM | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
 		certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
 	}
 
@@ -408,8 +318,6 @@ CertificateChainEditor::CertificateChainEditor (
 	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
 	_remake_certificates = new Button (this, _("Re-make certificates and key..."));
 	_button_sizer->Add (_remake_certificates, 1, wxRIGHT, border);
-	_export_chain = new Button (this, _("Export chain..."));
-	_button_sizer->Add (_export_chain, 1, wxRIGHT, border);
 	table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 4));
 	++r;
 
@@ -499,6 +407,11 @@ CertificateChainEditor::add_certificate ()
 void
 CertificateChainEditor::remove_certificate ()
 {
+	if (_nag_alter()) {
+		/* Cancel was clicked */
+		return;
+	}
+
 	int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (i == -1) {
 		return;
@@ -510,6 +423,7 @@ CertificateChainEditor::remove_certificate ()
 	_set (chain);
 
 	update_sensitivity ();
+	update_certificate_list ();
 }
 
 void
@@ -535,7 +449,7 @@ CertificateChainEditor::export_certificate ()
 		boost::filesystem::path path (wx_to_std(d->GetPath()));
 		FILE* f = fopen_boost (path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, false);
+			throw OpenFileError (path, errno, OpenFileError::WRITE);
 		}
 
 		string const s = j->certificate (true);
@@ -557,7 +471,7 @@ CertificateChainEditor::export_chain ()
 		boost::filesystem::path path (wx_to_std(d->GetPath()));
 		FILE* f = fopen_boost (path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, false);
+			throw OpenFileError (path, errno, OpenFileError::WRITE);
 		}
 
 		string const s = _get()->chain();
@@ -634,7 +548,7 @@ CertificateChainEditor::remake_certificates ()
 		intermediate_common_name = i->subject_common_name ();
 	}
 
-	if (_nag_remake()) {
+	if (_nag_alter()) {
 		/* Cancel was clicked */
 		return;
 	}
@@ -731,7 +645,7 @@ CertificateChainEditor::export_private_key ()
 		boost::filesystem::path path (wx_to_std(d->GetPath()));
 		FILE* f = fopen_boost (path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, false);
+			throw OpenFileError (path, errno, OpenFileError::WRITE);
 		}
 
 		string const s = _get()->key().get ();
@@ -761,14 +675,18 @@ KeysPage::setup ()
 		sizer->Add (m, 0, wxALL, _border);
 	}
 
+	wxSizer* buttons = new wxBoxSizer (wxVERTICAL);
+
 	wxButton* export_decryption_certificate = new Button (_panel, _("Export KDM decryption certificate..."));
-	sizer->Add (export_decryption_certificate, 0, wxLEFT, _border);
+	buttons->Add (export_decryption_certificate, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	wxButton* export_settings = new Button (_panel, _("Export all KDM decryption settings..."));
-	sizer->Add (export_settings, 0, wxLEFT, _border);
+	buttons->Add (export_settings, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	wxButton* import_settings = new Button (_panel, _("Import all KDM decryption settings..."));
-	sizer->Add (import_settings, 0, wxLEFT, _border);
+	buttons->Add (import_settings, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	wxButton* decryption_advanced = new Button (_panel, _("Advanced..."));
-	sizer->Add (decryption_advanced, 0, wxALL, _border);
+	buttons->Add (decryption_advanced, 0);
+
+	sizer->Add (buttons, 0, wxLEFT, _border);
 
 	export_decryption_certificate->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_certificate, this));
 	export_settings->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_chain_and_key, this));
@@ -782,7 +700,7 @@ KeysPage::setup ()
 	}
 
 	wxButton* signing_advanced = new Button (_panel, _("Advanced..."));
-	sizer->Add (signing_advanced, 0, wxLEFT, _border);
+	sizer->Add (signing_advanced, 0, wxLEFT | wxBOTTOM, _border);
 	signing_advanced->Bind (wxEVT_BUTTON, bind (&KeysPage::signing_advanced, this));
 }
 
@@ -793,7 +711,7 @@ KeysPage::decryption_advanced ()
 		_panel, _("Decrypting KDMs"), _border,
 		bind (&Config::set_decryption_chain, Config::instance (), _1),
 		bind (&Config::decryption_chain, Config::instance ()),
-		bind (&KeysPage::nag_remake_decryption_chain, this)
+		bind (&KeysPage::nag_alter_decryption_chain, this)
 		);
 
 	c->ShowModal();
@@ -824,7 +742,7 @@ KeysPage::export_decryption_chain_and_key ()
 		boost::filesystem::path path (wx_to_std(d->GetPath()));
 		FILE* f = fopen_boost (path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, false);
+			throw OpenFileError (path, errno, OpenFileError::WRITE);
 		}
 
 		string const chain = Config::instance()->decryption_chain()->chain();
@@ -859,7 +777,7 @@ KeysPage::import_decryption_chain_and_key ()
 
 		FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "r");
 		if (!f) {
-			throw OpenFileError (wx_to_std (d->GetPath ()), errno, false);
+			throw OpenFileError (wx_to_std (d->GetPath ()), errno, OpenFileError::WRITE);
 		}
 
 		string current;
@@ -889,11 +807,11 @@ KeysPage::import_decryption_chain_and_key ()
 }
 
 bool
-KeysPage::nag_remake_decryption_chain ()
+KeysPage::nag_alter_decryption_chain ()
 {
 	return NagDialog::maybe_nag (
 		_panel,
-		Config::NAG_REMAKE_DECRYPTION_CHAIN,
+		Config::NAG_ALTER_DECRYPTION_CHAIN,
 		_("If you continue with this operation you will no longer be able to use any DKDMs that you have created.  Also, any KDMs that have been sent to you will become useless.  Proceed with caution!"),
 		true
 		);
@@ -911,7 +829,7 @@ KeysPage::export_decryption_certificate ()
 		boost::filesystem::path path (wx_to_std(d->GetPath()));
 		FILE* f = fopen_boost (path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, false);
+			throw OpenFileError (path, errno, OpenFileError::WRITE);
 		}
 
 		string const s = Config::instance()->decryption_chain()->leaf().certificate (true);
@@ -921,3 +839,327 @@ 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;
+
+	add_label_to_sizer (table, _panel, _("Mapping"), true, wxGBPosition(r, 0));
+	_map = new AudioMappingView (_panel, _("DCP"), _("DCP"), _("Output"), _("output"));
+	_map->SetSize (-1, 600);
+	table->Add (_map, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+	++r;
+
+	_reset_to_default = new Button (_panel, _("Reset to default"));
+	table->Add (_reset_to_default, 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) {
+		try {
+			RtAudio::DeviceInfo dev = audio.getDeviceInfo (i);
+			if (dev.probed && dev.outputChannels > 0) {
+				_sound_output->Append (std_to_wx (dev.name));
+			}
+#ifdef DCPOMATIC_USE_RTERROR
+		} catch (RtError&) {
+#else
+		} catch (RtAudioError&) {
+#endif
+			/* Something went wrong so let's just ignore that device */
+		}
+	}
+
+	_sound->Bind        (wxEVT_CHECKBOX, bind(&SoundPage::sound_changed, this));
+	_sound_output->Bind (wxEVT_CHOICE,   bind(&SoundPage::sound_output_changed, this));
+	_map->Changed.connect (bind(&SoundPage::map_changed, this, _1));
+	_reset_to_default->Bind (wxEVT_BUTTON,   bind(&SoundPage::reset_to_default, this));
+}
+
+void
+SoundPage::reset_to_default ()
+{
+	Config::instance()->set_audio_mapping_to_default ();
+}
+
+void
+SoundPage::map_changed (AudioMapping m)
+{
+	Config::instance()->set_audio_mapping (m);
+}
+
+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();
+	string default_device;
+	try {
+		default_device = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
+#ifdef DCPOMATIC_USE_RTERROR
+	} catch (RtError&) {
+#else
+	} catch (RtAudioError&) {
+#endif
+		/* Never mind */
+	}
+	if (!so || *so == default_device) {
+		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;
+#ifdef DCPOMATIC_USE_RTERROR
+		} catch (RtError&) {
+#else
+		} catch (RtAudioError&) {
+#endif
+			/* 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) {
+			try {
+				RtAudio::DeviceInfo info = audio.getDeviceInfo(i);
+				if (info.name == *configured_so && info.outputChannels > 0) {
+					channels = info.outputChannels;
+				}
+#ifdef DCPOMATIC_USE_RTERROR
+			} catch (RtError&) {
+#else
+			} catch (RtAudioError&) {
+#endif
+				/* Never mind */
+			}
+		}
+	}
+
+	_sound_output_details->SetLabel (
+		wxString::Format(_("%d channels on %s"), channels, apis[audio.getCurrentApi()])
+		);
+
+	_map->set (Config::instance()->audio_mapping(channels));
+
+	vector<NamedChannel> input;
+	for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+		input.push_back (NamedChannel(short_audio_channel_name(i), i));
+	}
+	_map->set_input_channels (input);
+
+	vector<NamedChannel> output;
+	for (int i = 0; i < channels; ++i) {
+		output.push_back (NamedChannel(dcp::raw_convert<string>(i), i));
+	}
+	_map->set_output_channels (output);
+
+	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));
+}
+
+
+LocationsPage::LocationsPage (wxSize panel_size, int border)
+	: Page (panel_size, border)
+{
+
+}
+
+wxString
+LocationsPage::GetName () const
+{
+	return _("Locations");
+}
+
+#ifdef DCPOMATIC_OSX
+wxBitmap
+LocationsPage::GetLargeIcon () const
+{
+	return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
+}
+#endif
+
+void
+LocationsPage::setup ()
+{
+	int r = 0;
+
+	wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
+
+	add_label_to_sizer (table, _panel, _("Content directory"), true, wxGBPosition (r, 0));
+	_content_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
+	table->Add (_content_directory, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_sizer (table, _panel, _("Playlist directory"), true, wxGBPosition (r, 0));
+	_playlist_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
+	table->Add (_playlist_directory, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0));
+	_kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
+	table->Add (_kdm_directory, wxGBPosition (r, 1));
+	++r;
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0));
+	_background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true, false);
+	table->Add (_background_image, wxGBPosition (r, 1));
+	++r;
+#endif
+
+	_content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this));
+	_playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this));
+	_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	_background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this));
+#endif
+}
+
+void
+LocationsPage::config_changed ()
+{
+	Config* config = Config::instance ();
+
+	if (config->player_content_directory()) {
+		checked_set (_content_directory, *config->player_content_directory());
+	}
+	if (config->player_playlist_directory()) {
+		checked_set (_playlist_directory, *config->player_playlist_directory());
+	}
+	if (config->player_kdm_directory()) {
+		checked_set (_kdm_directory, *config->player_kdm_directory());
+	}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	if (config->player_background_image()) {
+		checked_set (_background_image, *config->player_background_image());
+	}
+#endif
+}
+
+void
+LocationsPage::content_directory_changed ()
+{
+	Config::instance()->set_player_content_directory(wx_to_std(_content_directory->GetPath()));
+}
+
+void
+LocationsPage::playlist_directory_changed ()
+{
+	Config::instance()->set_player_playlist_directory(wx_to_std(_playlist_directory->GetPath()));
+}
+
+void
+LocationsPage::kdm_directory_changed ()
+{
+	Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
+}
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+void
+LocationsPage::background_image_changed ()
+{
+	boost::filesystem::path const f = wx_to_std(_background_image->GetPath());
+	if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) {
+		error_dialog (0, _("Could not load image file."));
+		if (Config::instance()->player_background_image()) {
+			checked_set (_background_image, *Config::instance()->player_background_image());
+		}
+		return;
+	}
+
+	Config::instance()->set_player_background_image(f);
+}
+#endif