X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=0f6bace2590282c8ad792513e22afd1fcdf03ab0;hp=a08d29ad8c7663ab99d9e36a13468507a26c9c3d;hb=4b5e05b9845d609524328a88a81011b364e03a8a;hpb=9d4906db6e143248cf1e814d539aa2c7a50721dc

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index a08d29ad8..0f6bace25 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -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"
@@ -36,16 +38,18 @@ using std::list;
 using std::vector;
 using std::pair;
 using boost::shared_ptr;
+using boost::weak_ptr;
 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.
  *  @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)
+AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer, shared_ptr<Content> content)
 	: wxDialog (
 		parent,
 		wxID_ANY,
@@ -62,6 +66,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 #endif
 		)
 	, _film (film)
+	, _viewer (viewer)
 	, _content (content)
 	, _channels (film->audio_channels ())
 	, _plot (0)
@@ -74,40 +79,42 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
 	wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
 
-	_plot = new AudioPlot (this);
+	_cursor = new StaticText (this, wxT("Cursor: none"));
+	left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+	_plot = new AudioPlot (this, viewer);
 	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);
+	_leqm = new StaticText (this, wxT(""));
+	left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
-	lr_sizer->Add (left, 1, wxALL, 12);
+	lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
 
 	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;
-	}
+	show_or_hide_channel_checkboxes ();
 
 	{
-		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);
 	}
@@ -118,13 +125,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);
 	}
@@ -135,7 +142,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
 	lr_sizer->Add (right, 0, wxALL, 12);
 
-	overall_sizer->Add (lr_sizer);
+	overall_sizer->Add (lr_sizer, 0, wxEXPAND);
 
 #ifdef DCPOMATIC_LINUX
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
@@ -148,17 +155,35 @@ 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));
-	SetTitle (_("DCP-o-matic audio"));
+	_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 ();
 	}
+
+	_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 ()
 {
@@ -175,6 +200,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)
 			);
@@ -200,6 +232,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 */
 
@@ -277,8 +310,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) {
@@ -326,7 +379,7 @@ AudioDialog::setup_statistics ()
 	}
 
 	pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
-	float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist);
+	float const peak_dB = linear_to_db(peak.first.peak) + _analysis->gain_correction(_playlist);
 	_sample_peak->SetLabel (
 		wxString::Format (
 			_("Sample peak is %.2fdB at %s on %s"),
@@ -344,7 +397,7 @@ AudioDialog::setup_statistics ()
 
 	if (_analysis->overall_true_peak()) {
 		float const peak = _analysis->overall_true_peak().get();
-		float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist);
+		float const peak_dB = linear_to_db(peak) + _analysis->gain_correction(_playlist);
 
 		_true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB));
 
@@ -374,6 +427,14 @@ AudioDialog::setup_statistics ()
 				)
 			);
 	}
+
+	if (static_cast<bool>(_analysis->leqm())) {
+		_leqm->SetLabel(
+			wxString::Format(
+				_("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist)
+				)
+			);
+	}
 }
 
 bool
@@ -383,3 +444,16 @@ AudioDialog::Show (bool show)
 	try_to_load_analysis ();
 	return r;
 }
+
+void
+AudioDialog::set_cursor (optional<DCPTime> time, optional<float> db)
+{
+	if (!time || !db) {
+		_cursor->SetLabel (_("Cursor: none"));
+		return;
+	}
+
+	shared_ptr<Film> film = _film.lock();
+	DCPOMATIC_ASSERT (film);
+	_cursor->SetLabel (wxString::Format (_("Cursor: %.1fdB at %s"), *db, time->timecode(film->video_frame_rate())));
+}