X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=21e4e5940e4b100c089ec1e8f1175371c434aa17;hb=aabf54736d7401437af7f066c51fee91be64e809;hp=701c8263a48b27e8a8391da28865eae1fb516dc1;hpb=2eb98dd87bb359ae333247af55b650fced7f6311;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 701c8263a..21e4e5940 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -29,26 +29,33 @@ using boost::bind;
 using boost::optional;
 
 AudioDialog::AudioDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
 	, _plot (0)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	_plot = new AudioPlot (this);
-	sizer->Add (_plot, 1, wxALL, 12);
+	sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+	wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
+
+	{
+		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+		side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+	}
+	
 
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i));
-		table->Add (_channel_checkbox[i], 1, wxEXPAND);
-		table->AddSpacer (0);
+		_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+		side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3);
 		_channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this);
 	}
 
-	table->AddSpacer (0);
-	table->AddSpacer (0);
-
+	{
+		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+		side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+	}
+	
 	wxString const types[] = {
 		_("Peak"),
 		_("RMS")
@@ -56,12 +63,20 @@ AudioDialog::AudioDialog (wxWindow* parent)
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
-		table->Add (_type_checkbox[i], 1, wxEXPAND);
-		table->AddSpacer (0);
+		side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3);
 		_type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this);
 	}
 
-	sizer->Add (table, 0, wxALL, 12);
+	{
+		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+		side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+	}
+	
+	_smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
+	_smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this);
+	side->Add (_smoothing, 1, wxEXPAND);
+
+	sizer->Add (side, 0, wxALL, 12);
 
 	SetSizer (sizer);
 	sizer->Layout ();
@@ -72,7 +87,7 @@ void
 AudioDialog::set_film (boost::shared_ptr<Film> f)
 {
 	_film_changed_connection.disconnect ();
-	_film_audio_analysis_finished_connection.disconnect ();
+	_film_audio_analysis_succeeded_connection.disconnect ();
 	
 	_film = f;
 
@@ -81,9 +96,9 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
 	_plot->set_gain (_film->audio_gain ());
 
 	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
-	_film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this));
+	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
 
-	SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name()));
+	SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
 void
@@ -93,7 +108,7 @@ AudioDialog::setup_channels ()
 		return;
 	}
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -119,7 +134,7 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	optional<libdcp::Channel> c = m.source_to_dcp (0);
 	if (c) {
 		_channel_checkbox[c.get()]->SetValue (true);
@@ -142,7 +157,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
 	if (s) {
 		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
@@ -178,3 +193,9 @@ AudioDialog::type_clicked (wxCommandEvent& ev)
 
 	_plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
 }
+
+void
+AudioDialog::smoothing_changed (wxScrollEvent &)
+{
+	_plot->set_smoothing (_smoothing->GetValue ());
+}