X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=8a38c8a87edb2ef9fe8a0f1f8cb09339d91c3931;hb=2d57296a24c2eb4f6d99325add0e986de04f7e7d;hp=b2fb0efe5d4aa2b2341d686ca8b3fdce170626fe;hpb=d7c856b59bc53e2a92f2b12c6244b089b236f536;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index b2fb0efe5..8a38c8a87 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -33,13 +33,18 @@
 
 using std::cout;
 using std::list;
+using std::vector;
+using std::pair;
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
 
-/** @param content Content to analyse, or 0 to analyse all of the film's audio */
+/** @param parent Parent window.
+ *  @param film Film we are using.
+ *  @param content Content to analyse, or 0 to analyse all of the film's audio.
+ */
 AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content)
 	: wxDialog (
 		parent,
@@ -47,7 +52,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 		_("Audio"),
 		wxDefaultPosition,
 		wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+		/* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+		   the window above all others (and not just our own) it's better than nothing for now.
+		*/
 		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
+		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
 		)
 	, _film (film)
 	, _content (content)
@@ -86,7 +98,11 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	for (int i = 0; i < _channels; ++i) {
 		_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
 		right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
-		_channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
+		_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;
 	}
 
 	{
@@ -103,7 +119,7 @@ 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]);
 		right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3);
-		_type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1));
+		_type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1));
 	}
 
 	{
@@ -162,8 +178,12 @@ AudioDialog::try_to_load_analysis ()
 
 	try {
 		_analysis.reset (new AudioAnalysis (path));
+	} catch (OldFormatError& e) {
+		/* An old analysis file: recreate it */
+		JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
+		return;
 	} catch (xmlpp::exception& e) {
-		/* Probably an old-style analysis file: recreate it */
+		/* Probably a (very) old-style analysis file: recreate it */
 		JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
 		return;
         }
@@ -218,7 +238,10 @@ void
 AudioDialog::analysis_finished ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
+	if (!film) {
+		/* This should not happen, but if it does we should just give up quietly */
+		return;
+	}
 
 	if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) {
 		/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
@@ -293,27 +316,26 @@ AudioDialog::setup_statistics ()
 		return;
 	}
 
-	if (static_cast<bool>(_analysis->sample_peak ())) {
-
-		float const peak_dB = 20 * log10 (_analysis->sample_peak().get()) + _analysis->gain_correction (_playlist);
-
-		_sample_peak->SetLabel (
-			wxString::Format (
-				_("Sample peak is %.2fdB at %s"),
-				peak_dB,
-				time_to_timecode (_analysis->sample_peak_time().get(), film->video_frame_rate ()).data ()
-				)
-			);
-
-		if (peak_dB > -3) {
-			_sample_peak->SetForegroundColour (wxColour (255, 0, 0));
-		} else {
-			_sample_peak->SetForegroundColour (wxColour (0, 0, 0));
-		}
+	pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
+	float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist);
+	_sample_peak->SetLabel (
+		wxString::Format (
+			_("Sample peak is %.2fdB at %s on %s"),
+			peak_dB,
+			time_to_timecode (peak.first.time, film->video_frame_rate ()).data (),
+			std_to_wx (short_audio_channel_name (peak.second)).data ()
+			)
+		);
+
+	if (peak_dB > -3) {
+		_sample_peak->SetForegroundColour (wxColour (255, 0, 0));
+	} else {
+		_sample_peak->SetForegroundColour (wxColour (0, 0, 0));
 	}
 
-	if (static_cast<bool>(_analysis->true_peak ())) {
-		float const peak_dB = 20 * log10 (_analysis->true_peak().get()) + _analysis->gain_correction (_playlist);
+	if (_analysis->overall_true_peak()) {
+		float const peak = _analysis->overall_true_peak().get();
+		float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist);
 
 		_true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB));