Merge branch '1.0' into 1.0-seek

2 files changed, 21 insertions, 0 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 71a0f505f..4743000f2 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -158,6 +158,15 @@ ConfigDialog::make_misc_panel ()
 		add_label_to_sizer (s, _misc_panel, _("MBps"), false);
 		table->Add (s, 1);
 	}
+
+	{
+		add_label_to_sizer (table, _misc_panel, _("Default audio delay"), true);
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_default_audio_delay = new wxSpinCtrl (_misc_panel);
+		s->Add (_default_audio_delay);
+		add_label_to_sizer (s, _misc_panel, _("ms"), false);
+		table->Add (s, 1);
+	}
 	
 	Config* config = Config::instance ();
 
@@ -225,6 +234,10 @@ ConfigDialog::make_misc_panel ()
 	_default_j2k_bandwidth->SetRange (50, 250);
 	_default_j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000);
 	_default_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::default_j2k_bandwidth_changed, this));
+
+	_default_audio_delay->SetRange (-1000, 1000);
+	_default_audio_delay->SetValue (config->default_audio_delay ());
+	_default_audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::default_audio_delay_changed, this));
 }
 
 void
@@ -457,6 +470,12 @@ ConfigDialog::default_j2k_bandwidth_changed ()
 	Config::instance()->set_default_j2k_bandwidth (_default_j2k_bandwidth->GetValue() * 1000000);
 }
 
+void
+ConfigDialog::default_audio_delay_changed ()
+{
+	Config::instance()->set_default_audio_delay (_default_audio_delay->GetValue());
+}
+
 static std::string
 colour_conversion_column (PresetColourConversion c)
 {
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 3a196cce3..45739ef92 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -58,6 +58,7 @@ private:
 	void issuer_changed ();
 	void creator_changed ();
 	void default_j2k_bandwidth_changed ();
+	void default_audio_delay_changed ();
 	void mail_server_changed ();
 	void kdm_from_changed ();
 	void kdm_email_changed ();
@@ -99,6 +100,7 @@ private:
 	wxTextCtrl* _issuer;
 	wxTextCtrl* _creator;
 	wxSpinCtrl* _default_j2k_bandwidth;
+	wxSpinCtrl* _default_audio_delay;
 	wxPanel* _kdm_email_panel;
 	wxTextCtrl* _kdm_email;
 	wxCheckBox* _use_any_servers;