X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=50831ec4076607e5833a64d7cc5f983a02ae44c3;hp=85ca19208f1429b86c91212bca7a999ff33ed603;hb=28dc02d0b3759f37f66fed9a5f7e35d1c7c61aeb;hpb=a6696b9a58c14d81f0ae30482051c2cd47a004db

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 85ca19208..50831ec40 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -26,37 +26,49 @@
 #include "content_panel.h"
 #include "dcpomatic_button.h"
 #include "gain_calculator_dialog.h"
-#include "language_tag_widget.h"
 #include "static_text.h"
 #include "wx_util.h"
+#include "lib/audio_content.h"
+#include "lib/cinema_sound_processor.h"
 #include "lib/config.h"
+#include "lib/dcp_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/cinema_sound_processor.h"
 #include "lib/job_manager.h"
-#include "lib/dcp_content.h"
-#include "lib/audio_content.h"
+#include "lib/maths_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 
 
-using std::vector;
-using std::cout;
-using std::string;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::pair;
 using std::make_shared;
-using std::dynamic_pointer_cast;
+using std::pair;
+using std::set;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
+using namespace dcpomatic;
+
+
+std::map<boost::filesystem::path, float> AudioPanel::_peak_cache;
 
 
 AudioPanel::AudioPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Audio"))
-	, _audio_dialog (0)
+{
+
+}
+
+
+void
+AudioPanel::create ()
 {
 	_reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF"));
 	_reference_note = new StaticText (this, wxT(""));
@@ -95,8 +107,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
 	_delay_ms_label = create_label (this, _("ms"), false);
 
-	_enable_language = new wxCheckBox (this, wxID_ANY, _("Language"));
-	_language = new LanguageTagWidget (this, _("Language used for the dialogue in this content"), boost::none);
+	_fade_in_label = create_label (this, _("Fade in"), true);
+	_fade_in = new Timecode<ContentTime> (this);
+
+	_fade_out_label = create_label (this, _("Fade out"), true);
+	_fade_out = new Timecode<ContentTime> (this);
+
+	_use_same_fades_as_video = new CheckBox(this, _("Use same fades as video"));
 
 	_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
@@ -115,18 +132,23 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	film_changed (Film::Property::VIDEO_FRAME_RATE);
 	film_changed (Film::Property::REEL_TYPE);
 
-	_reference->Bind             (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this));
+	_reference->bind(&AudioPanel::reference_clicked, this);
 	_show->Bind                  (wxEVT_BUTTON,   boost::bind (&AudioPanel::show_clicked, this));
 	_gain_calculate_button->Bind (wxEVT_BUTTON,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
-	_enable_language->Bind       (wxEVT_CHECKBOX, boost::bind (&AudioPanel::enable_language_clicked, this));
-	_language->Changed.connect (boost::bind(&AudioPanel::language_changed, this));
+
+	_fade_in->Changed.connect (boost::bind(&AudioPanel::fade_in_changed, this));
+	_fade_out->Changed.connect (boost::bind(&AudioPanel::fade_out_changed, this));
+	_use_same_fades_as_video->bind(&AudioPanel::use_same_fades_as_video_changed, this);
 
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 	_active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
 
 	add_to_grid ();
+
+	layout();
 }
 
+
 void
 AudioPanel::add_to_grid ()
 {
@@ -160,21 +182,19 @@ AudioPanel::add_to_grid ()
 	_grid->Add (s, wxGBPosition(r, 1));
 	++r;
 
-	s = new wxBoxSizer (wxHORIZONTAL);
-	s->Add (_enable_language, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
-	s->Add (_language->sizer(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT);
-	_grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
+	add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition(r, 0));
+	_grid->Add (_fade_in, wxGBPosition(r, 1), wxGBSpan(1, 3));
 	++r;
-}
 
-AudioPanel::~AudioPanel ()
-{
-	if (_audio_dialog) {
-		_audio_dialog->Destroy ();
-		_audio_dialog = nullptr;
-	}
+	add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition(r, 0));
+	_grid->Add (_fade_out, wxGBPosition(r, 1), wxGBSpan(1, 3));
+	++r;
+
+	_grid->Add (_use_same_fades_as_video, wxGBPosition(r, 0), wxGBSpan(1, 4));
+	++r;
 }
 
+
 void
 AudioPanel::film_changed (Film::Property property)
 {
@@ -200,6 +220,7 @@ AudioPanel::film_changed (Film::Property property)
 	}
 }
 
+
 void
 AudioPanel::film_content_changed (int property)
 {
@@ -230,8 +251,10 @@ AudioPanel::film_content_changed (int property)
 		}
 		setup_description ();
 		setup_peak ();
-		_sizer->Layout ();
+		layout ();
 	} else if (property == AudioContentProperty::GAIN) {
+		/* This is a bit aggressive but probably not so bad */
+		_peak_cache.clear();
 		setup_peak ();
 	} else if (property == DCPContentProperty::REFERENCE_AUDIO) {
 		if (ac.size() == 1) {
@@ -244,32 +267,54 @@ AudioPanel::film_content_changed (int property)
 		setup_sensitivity ();
 	} else if (property == ContentProperty::VIDEO_FRAME_RATE) {
 		setup_description ();
-	} else if (property == AudioContentProperty::LANGUAGE) {
-		if (ac.size() == 1 && ac.front()->audio->language()) {
-			_enable_language->SetValue (true);
-			_language->set (ac.front()->audio->language());
+	} else if (property == AudioContentProperty::FADE_IN) {
+		set<Frame> check;
+		for (auto i: ac) {
+			check.insert (i->audio->fade_in().get());
+		}
+
+		if (check.size() == 1) {
+			_fade_in->set (
+				ac.front()->audio->fade_in(),
+				ac.front()->active_video_frame_rate(_parent->film())
+				);
 		} else {
-			_enable_language->SetValue (false);
-			_language->set (boost::none);
+			_fade_in->clear ();
+		}
+	} else if (property == AudioContentProperty::FADE_OUT) {
+		set<Frame> check;
+		for (auto i: ac) {
+			check.insert (i->audio->fade_out().get());
 		}
+
+		if (check.size() == 1) {
+			_fade_out->set (
+				ac.front()->audio->fade_out(),
+				ac.front()->active_video_frame_rate(_parent->film())
+				);
+		} else {
+			_fade_out->clear ();
+		}
+	} else if (property == AudioContentProperty::USE_SAME_FADES_AS_VIDEO) {
+		setup_sensitivity ();
 	}
 }
 
+
 void
 AudioPanel::gain_calculate_button_clicked ()
 {
-	auto d = new GainCalculatorDialog (this);
-	auto const r = d->ShowModal ();
-	auto c = d->db_change();
+	GainCalculatorDialog dialog(this);
+	auto const r = dialog.ShowModal();
+	auto change = dialog.db_change();
 
-	if (r == wxID_CANCEL || !c) {
-		d->Destroy ();
+	if (r == wxID_CANCEL || !change) {
 		return;
 	}
 
 	auto old_peak_dB = peak ();
 	auto old_value = _gain->wrapped()->GetValue();
-	_gain->wrapped()->SetValue(old_value + *c);
+	_gain->wrapped()->SetValue(old_value + *change);
 
 	/* This appears to be necessary, as the change is not signalled,
 	   I think.
@@ -282,10 +327,9 @@ AudioPanel::gain_calculate_button_clicked ()
 		_gain->wrapped()->SetValue (old_value);
 		_gain->view_changed ();
 	}
-
-	d->Destroy ();
 }
 
+
 void
 AudioPanel::setup_description ()
 {
@@ -298,6 +342,7 @@ AudioPanel::setup_description ()
 	checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
 }
 
+
 void
 AudioPanel::mapping_changed (AudioMapping m)
 {
@@ -307,6 +352,7 @@ AudioPanel::mapping_changed (AudioMapping m)
 	}
 }
 
+
 void
 AudioPanel::content_selection_changed ()
 {
@@ -317,12 +363,15 @@ AudioPanel::content_selection_changed ()
 
 	film_content_changed (AudioContentProperty::STREAMS);
 	film_content_changed (AudioContentProperty::GAIN);
-	film_content_changed (AudioContentProperty::LANGUAGE);
+	film_content_changed (AudioContentProperty::FADE_IN);
+	film_content_changed (AudioContentProperty::FADE_OUT);
+	film_content_changed (AudioContentProperty::USE_SAME_FADES_AS_VIDEO);
 	film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
 
 	setup_sensitivity ();
 }
 
+
 void
 AudioPanel::setup_sensitivity ()
 {
@@ -343,44 +392,39 @@ AudioPanel::setup_sensitivity ()
 	}
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
 
-	if (_reference->GetValue ()) {
-		_gain->wrapped()->Enable (false);
-		_gain_calculate_button->Enable (false);
-		_show->Enable (true);
-		_peak->Enable (false);
-		_delay->wrapped()->Enable (false);
-		_mapping->Enable (false);
-		_description->Enable (false);
-	} else {
-		_gain->wrapped()->Enable (sel.size() == 1);
-		_gain_calculate_button->Enable (sel.size() == 1);
-		_show->Enable (sel.size() == 1);
-		_peak->Enable (sel.size() == 1);
-		_delay->wrapped()->Enable (sel.size() == 1);
-		_mapping->Enable (sel.size() == 1);
-		_description->Enable (sel.size() == 1);
-	}
-
-	_language->enable (_enable_language->GetValue());
+	auto const ref = _reference->GetValue();
+	auto const single = sel.size() == 1;
+
+	auto const all_have_video = std::all_of(sel.begin(), sel.end(), [](shared_ptr<const Content> c) { return static_cast<bool>(c->video); });
+
+	_gain->wrapped()->Enable (!ref);
+	_gain_calculate_button->Enable (!ref && single);
+	_show->Enable (single);
+	_peak->Enable (!ref && single);
+	_delay->wrapped()->Enable (!ref);
+	_mapping->Enable (!ref && single);
+	_description->Enable (!ref && single);
+	_fade_in->Enable (!_use_same_fades_as_video->GetValue());
+	_fade_out->Enable (!_use_same_fades_as_video->GetValue());
+	_use_same_fades_as_video->Enable (!ref && all_have_video);
 }
 
+
 void
 AudioPanel::show_clicked ()
 {
-	if (_audio_dialog) {
-		_audio_dialog->Destroy ();
-		_audio_dialog = nullptr;
-	}
+	_audio_dialog.reset();
 
 	auto ac = _parent->selected_audio ();
 	if (ac.size() != 1) {
 		return;
 	}
 
-	_audio_dialog = new AudioDialog (this, _parent->film(), _parent->film_viewer(), ac.front());
+	_audio_dialog.reset(this, _parent->film(), _parent->film_viewer(), ac.front());
 	_audio_dialog->Show ();
 }
 
+
 /** @return If there is one selected piece of audio content, return its peak value in dB (if known) */
 optional<float>
 AudioPanel::peak () const
@@ -392,8 +436,18 @@ AudioPanel::peak () const
 		auto playlist = make_shared<Playlist>();
 		playlist->add (_parent->film(), sel.front());
 		try {
-			auto analysis = make_shared<AudioAnalysis>(_parent->film()->audio_analysis_path(playlist));
-			peak_dB = linear_to_db(analysis->overall_sample_peak().first.peak) + analysis->gain_correction(playlist);
+			/* Loading the audio analysis file is slow, and this ::peak() is called a few times when
+			 * the content selection is changed, so cache it.
+			 */
+			auto const path = _parent->film()->audio_analysis_path(playlist);
+			auto cached = _peak_cache.find(path);
+			if (cached != _peak_cache.end()) {
+				peak_dB = cached->second;
+			} else {
+				auto analysis = make_shared<AudioAnalysis>(path);
+				peak_dB = linear_to_db(analysis->overall_sample_peak().first.peak) + analysis->gain_correction(playlist);
+				_peak_cache[path] = *peak_dB;
+			}
 		} catch (...) {
 
 		}
@@ -402,6 +456,7 @@ AudioPanel::peak () const
 	return peak_dB;
 }
 
+
 void
 AudioPanel::setup_peak ()
 {
@@ -430,6 +485,7 @@ AudioPanel::setup_peak ()
 	}
 }
 
+
 void
 AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> new_active)
 {
@@ -441,6 +497,7 @@ AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> n
 	}
 }
 
+
 void
 AudioPanel::reference_clicked ()
 {
@@ -457,34 +514,42 @@ AudioPanel::reference_clicked ()
 	d->set_reference_audio (_reference->GetValue ());
 }
 
+
 void
 AudioPanel::set_film (shared_ptr<Film>)
 {
 	/* We are changing film, so destroy any audio dialog for the old one */
-	if (_audio_dialog) {
-		_audio_dialog->Destroy ();
-		_audio_dialog = nullptr;
+	_audio_dialog.reset();
+}
+
+
+void
+AudioPanel::fade_in_changed ()
+{
+	auto const hmsf = _fade_in->get();
+	for (auto i: _parent->selected_audio()) {
+		auto const vfr = i->active_video_frame_rate(_parent->film());
+		i->audio->set_fade_in (dcpomatic::ContentTime(hmsf, vfr));
 	}
 }
 
 
 void
-AudioPanel::enable_language_clicked ()
+AudioPanel::fade_out_changed ()
 {
-	setup_sensitivity ();
-	auto sel = _parent->selected_audio ();
-	if (sel.size() == 1) {
-		sel.front()->audio->set_language (_enable_language->GetValue() ? _language->get() : boost::none);
+	auto const hmsf = _fade_out->get();
+	for (auto i: _parent->selected_audio()) {
+		auto const vfr = i->active_video_frame_rate (_parent->film());
+		i->audio->set_fade_out (dcpomatic::ContentTime(hmsf, vfr));
 	}
 }
 
 
 void
-AudioPanel::language_changed ()
+AudioPanel::use_same_fades_as_video_changed ()
 {
-	auto sel = _parent->selected_audio ();
-	if (sel.size() == 1) {
-		sel.front()->audio->set_language (_language->get());
+	for (auto content: _parent->selected_audio()) {
+		content->audio->set_use_same_fades_as_video(_use_same_fades_as_video->GetValue());
 	}
 }