X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=c7a0815f821ba341aae418a7d6f2067072f95ae9;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=4c50260fa47b35d231b06803f19fcfe062b59978;hpb=5859b758e3a6e0191ce12e77b636c7def58bbc3b;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 4c50260fa..c7a0815f8 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -20,6 +20,7 @@
 #include <boost/filesystem.hpp>
 #include "lib/audio_analysis.h"
 #include "lib/film.h"
+#include "lib/audio_content.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "wx_util.h"
@@ -29,13 +30,13 @@ 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);
 
 	wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
 
@@ -43,12 +44,11 @@ AudioDialog::AudioDialog (wxWindow* parent)
 		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, 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);
+		_channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
 	}
 
 	{
@@ -64,7 +64,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
 		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);
+		_type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1));
 	}
 
 	{
@@ -73,7 +73,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 	}
 	
 	_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);
+	_smoothing->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&AudioDialog::smoothing_changed, this));
 	side->Add (_smoothing, 1, wxEXPAND);
 
 	sizer->Add (side, 0, wxALL, 12);
@@ -84,39 +84,36 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (shared_ptr<Film> f)
+AudioDialog::set_content (shared_ptr<AudioContent> c)
 {
-	_film_changed_connection.disconnect ();
-	_film_audio_analysis_succeeded_connection.disconnect ();
+	_content_changed_connection.disconnect ();
 	
-	_film = f;
+	_content = c;
 
 	try_to_load_analysis ();
-	_plot->set_gain (_film->audio_gain ());
+	_plot->set_gain (_content->audio_gain ());
 
-	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
-	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
+	_content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
 
-	SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path().filename().string()).data()));
 }
 
-
 void
 AudioDialog::try_to_load_analysis ()
 {
-	shared_ptr<AudioAnalysis> a;
-
-	if (boost::filesystem::exists (_film->audio_analysis_path())) {
-		a.reset (new AudioAnalysis (_film->audio_analysis_path ()));
-	} else {
-		if (IsShown ()) {
-			_film->analyse_audio ();
-		}
+	if (!boost::filesystem::exists (_content->audio_analysis_path()) && IsShown ()) {
+		_content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+		return;
 	}
-		
+	
+	shared_ptr<AudioAnalysis> a;
+	
+	a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
 	_plot->set_analysis (a);
 
-	_channel_checkbox[0]->SetValue (true);
+	if (_channel_checkbox[0]) {
+		_channel_checkbox[0]->SetValue (true);
+	}
 	_plot->set_channel_visible (0, true);
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
@@ -125,6 +122,20 @@ AudioDialog::try_to_load_analysis ()
 	}
 }
 
+void
+AudioDialog::analysis_finished ()
+{
+	if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+		/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
+		   Give up.
+		*/
+		_plot->set_message (_("Could not analyse audio."));
+		return;
+	}
+
+	try_to_load_analysis ();
+}
+
 void
 AudioDialog::channel_clicked (wxCommandEvent& ev)
 {
@@ -139,14 +150,10 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 }
 
 void
-AudioDialog::film_changed (Film::Property p)
+AudioDialog::content_changed (int p)
 {
-	switch (p) {
-	case Film::AUDIO_GAIN:
-		_plot->set_gain (_film->audio_gain ());
-		break;
-	default:
-		break;
+	if (p == AudioContentProperty::AUDIO_GAIN) {
+		_plot->set_gain (_content->audio_gain ());
 	}
 }
 
@@ -164,7 +171,7 @@ AudioDialog::type_clicked (wxCommandEvent& ev)
 }
 
 void
-AudioDialog::smoothing_changed (wxScrollEvent &)
+AudioDialog::smoothing_changed ()
 {
 	_plot->set_smoothing (_smoothing->GetValue ());
 }