X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=22e09cc7a8c1988973c21011a2027f064803ad38;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hp=bed7aac6d179730e072469ccbb5a0b432f8519d5;hpb=9b7df719c56b956e8a2aed336677550b64780c5a;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index bed7aac6d..22e09cc7a 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -29,7 +29,7 @@ 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);
@@ -83,37 +83,30 @@ 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;
-
-	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());
-	}
+	_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->file().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 ()));
+	if (boost::filesystem::exists (_content->audio_analysis_path())) {
+		a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
 	} else {
 		if (IsShown ()) {
-			_film->analyse_audio ();
+			_content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this));
 		}
 	}
 		
@@ -144,14 +137,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 ());
 	}
 }