X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=15d746839bc6b18ae241ebc62b45b82e21a885bf;hb=9bf304a86a3df6f4b10a572d657b5d7beb910582;hp=ba7ddd8f788dacaede8d5fca5a0ea6b57bc1d7ce;hpb=031a4066190454b1a4d933b74e86a053673a5e43;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index ba7ddd8f7..15d746839 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -18,10 +18,10 @@
 */
 
 #include <boost/filesystem.hpp>
+#include "lib/audio_analysis.h"
+#include "lib/film.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
-#include "audio_analysis.h"
-#include "film.h"
 #include "wx_util.h"
 
 using boost::shared_ptr;
@@ -35,7 +35,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 	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,7 +43,6 @@ 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)));
@@ -84,40 +83,26 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_film (shared_ptr<Film> f)
 {
 	_film_changed_connection.disconnect ();
 	_film_audio_analysis_succeeded_connection.disconnect ();
 	
 	_film = f;
 
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		_channel_checkbox[i]->Show (!_film->audio_mapping().dcp_to_content (static_cast<libdcp::Channel> (i)).empty());
+	}
+
 	try_to_load_analysis ();
-	setup_channels ();
 	_plot->set_gain (_film->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));
 
-	SetTitle (std_to_wx (String::compose (wx_to_std (_("DVD-o-matic audio - %1")), _film->name())));
+	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
-void
-AudioDialog::setup_channels ()
-{
-	if (!_film->audio_stream()) {
-		return;
-	}
-
-	AudioMapping m (_film->audio_stream()->channels ());
-	
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
-			_channel_checkbox[i]->Show ();
-		} else {
-			_channel_checkbox[i]->Hide ();
-		}
-	}
-}	
 
 void
 AudioDialog::try_to_load_analysis ()
@@ -134,12 +119,10 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_film->audio_stream()->channels ());
-	optional<libdcp::Channel> c = m.source_to_dcp (0);
-	if (c) {
-		_channel_checkbox[c.get()]->SetValue (true);
-		_plot->set_channel_visible (0, true);
+	if (_channel_checkbox[0]) {
+		_channel_checkbox[0]->SetValue (true);
 	}
+	_plot->set_channel_visible (0, true);
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i]->SetValue (true);
@@ -157,11 +140,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_film->audio_stream()->channels ());
-	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
-	if (s) {
-		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
-	}
+	_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
 void
@@ -171,11 +150,6 @@ AudioDialog::film_changed (Film::Property p)
 	case Film::AUDIO_GAIN:
 		_plot->set_gain (_film->audio_gain ());
 		break;
-	case Film::CONTENT_AUDIO_STREAM:
-	case Film::EXTERNAL_AUDIO:
-	case Film::USE_CONTENT_AUDIO:
-		setup_channels ();
-		break;
 	default:
 		break;
 	}