X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=a7d43ece873434bd5186a4e18dfecaf263adc760;hb=refs%2Fheads%2Fnew-boost-fixes;hp=f3f7c1f8ced0797c21d9dd3a9595eb9b1dc4e6b5;hpb=4df42c81390ed61aecbcc5bf0ad380937c26eaef;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f3f7c1f8c..a7d43ece8 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,9 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param parent Parent window.
  *  @param film Film we are using.
@@ -99,16 +102,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 		right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
 	}
 
-	for (int i = 0; i < _channels; ++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;
-	}
+	show_or_hide_channel_checkboxes ();
 
 	{
 		wxStaticText* m = new StaticText (this, _("Type"));
@@ -152,7 +153,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+	_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())));
 
@@ -166,6 +168,20 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	_plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2));
 }
 
+
+void
+AudioDialog::show_or_hide_channel_checkboxes ()
+{
+	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 ();
+	}
+}
+
+
 void
 AudioDialog::try_to_load_analysis ()
 {
@@ -214,6 +230,7 @@ AudioDialog::try_to_load_analysis ()
 	_plot->set_analysis (_analysis);
 	_plot->set_gain_correction (_analysis->gain_correction (_playlist));
 	setup_statistics ();
+	show_or_hide_channel_checkboxes ();
 
 	/* Set up some defaults if no check boxes are checked */
 
@@ -290,6 +307,22 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 	_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
+void
+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)
 {