X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=9b3a9376937d4c4c94cf9ec601c4d9613055c48f;hb=30c9ecad729397574754163d13253c54a2285a6a;hp=8c015ab68fabf5d95496f1b98ce2ba9cbc48b6e9;hpb=4023e615b8365d30a780c0ecfcf5b492819abe6f;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 8c015ab68..9b3a93769 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -21,6 +21,8 @@
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "wx_util.h"
+#include "static_text.h"
+#include "check_box.h"
 #include "lib/audio_analysis.h"
 #include "lib/film.h"
 #include "lib/analyse_audio_job.h"
@@ -40,6 +42,7 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @param parent Parent window.
  *  @param film Film we are using.
@@ -74,17 +77,17 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
 	wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
 
-	_cursor = new wxStaticText (this, wxID_ANY, wxT("Cursor: none"));
+	_cursor = new StaticText (this, wxT("Cursor: none"));
 	left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 	_plot = new AudioPlot (this);
 	left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
-	_sample_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+	_sample_peak = new StaticText (this, wxT (""));
 	left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_true_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+	_true_peak = new StaticText (this, wxT (""));
 	left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_integrated_loudness = new wxStaticText (this, wxID_ANY, wxT (""));
+	_integrated_loudness = new StaticText (this, wxT (""));
 	left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_loudness_range = new wxStaticText (this, wxID_ANY, wxT (""));
+	_loudness_range = new StaticText (this, wxT (""));
 	left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
 	lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
@@ -92,24 +95,20 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
 
 	{
-		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+		wxStaticText* m = new StaticText (this, _("Channels"));
 		m->SetFont (subheading_font);
 		right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
 	}
 
-	for (int i = 0; i < _channels; ++i) {
-		_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+	for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+		_channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
 		_channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
 		right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
 		_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
 	}
 
-	for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
-		_channel_checkbox[i] = 0;
-	}
-
 	{
-		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+		wxStaticText* m = new StaticText (this, _("Type"));
 		m->SetFont (subheading_font);
 		right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
 	}
@@ -120,13 +119,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	};
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
-		_type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
+		_type_checkbox[i] = new CheckBox (this, types[i]);
 		right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3);
 		_type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1));
 	}
 
 	{
-		wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+		wxStaticText* m = new StaticText (this, _("Smoothing"));
 		m->SetFont (subheading_font);
 		right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
 	}
@@ -150,13 +149,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2));
+	_film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2));
+	_film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
 	DCPOMATIC_ASSERT (film->directory());
 	SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
 
 	if (content) {
 		_playlist.reset (new Playlist ());
-		const_pointer_cast<Playlist> (_playlist)->add (content);
+		const_pointer_cast<Playlist>(_playlist)->add(film, content);
 	} else {
 		_playlist = film->playlist ();
 	}
@@ -180,6 +180,13 @@ AudioDialog::try_to_load_analysis ()
 	if (!boost::filesystem::exists (path)) {
 		_plot->set_analysis (shared_ptr<AudioAnalysis> ());
 		_analysis.reset ();
+
+		BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+			if (dynamic_pointer_cast<AnalyseAudioJob>(i)) {
+				i->cancel ();
+			}
+		}
+
 		JobManager::instance()->analyse_audio (
 			film, _playlist, !static_cast<bool>(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)
 			);
@@ -206,6 +213,14 @@ AudioDialog::try_to_load_analysis ()
 	_plot->set_gain_correction (_analysis->gain_correction (_playlist));
 	setup_statistics ();
 
+	for (int i = 0; i < _channels; ++i) {
+		_channel_checkbox[i]->Show ();
+	}
+
+	for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+		_channel_checkbox[i]->Hide ();
+	}
+
 	/* Set up some defaults if no check boxes are checked */
 
 	int i = 0;
@@ -282,8 +297,28 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 }
 
 void
-AudioDialog::content_changed (int p)
+AudioDialog::film_change (ChangeType type, int p)
 {
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
+	if (p == Film::AUDIO_CHANNELS) {
+		shared_ptr<Film> film = _film.lock ();
+		if (film) {
+			_channels = film->audio_channels ();
+			try_to_load_analysis ();
+		}
+	}
+}
+
+void
+AudioDialog::content_change (ChangeType type, int p)
+{
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
 	if (p == AudioContentProperty::STREAMS) {
 		try_to_load_analysis ();
 	} else if (p == AudioContentProperty::GAIN) {