X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=7efdeb8ac88de1acd7c63cda135f8d0f87db6b01;hb=1c9a65e90d05f02e1fd4914268435a9c2274459e;hp=75659aebdcd2087c227b4991709d5b21420c6d06;hpb=19e47294d1de485a12dccf2c25bec0c8144049e8;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 75659aebd..7efdeb8ac 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -28,34 +28,40 @@ #include "gain_calculator_dialog.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 +LIBDCP_DISABLE_WARNINGS #include -#include +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 AudioPanel::_peak_cache; AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) - , _audio_dialog (0) { } @@ -101,6 +107,14 @@ AudioPanel::create () /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time _delay_ms_label = create_label (this, _("ms"), false); + _fade_in_label = create_label (this, _("Fade in"), true); + _fade_in = new Timecode (this); + + _fade_out_label = create_label (this, _("Fade out"), true); + _fade_out = new Timecode (this); + + _use_same_fades_as_video = new wxCheckBox (this, wxID_ANY, _("Use same fades as video")); + _mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP")); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); @@ -122,6 +136,10 @@ AudioPanel::create () _show->Bind (wxEVT_BUTTON, boost::bind (&AudioPanel::show_clicked, this)); _gain_calculate_button->Bind (wxEVT_BUTTON, boost::bind (&AudioPanel::gain_calculate_button_clicked, 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 (wxEVT_CHECKBOX, boost::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)); @@ -130,6 +148,7 @@ AudioPanel::create () _sizer->Layout (); } + void AudioPanel::add_to_grid () { @@ -162,8 +181,20 @@ AudioPanel::add_to_grid () s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL); _grid->Add (s, wxGBPosition(r, 1)); ++r; + + add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition(r, 0)); + _grid->Add (_fade_in, wxGBPosition(r, 1), wxGBSpan(1, 3)); + ++r; + + 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; } + AudioPanel::~AudioPanel () { if (_audio_dialog) { @@ -197,6 +228,7 @@ AudioPanel::film_changed (Film::Property property) } } + void AudioPanel::film_content_changed (int property) { @@ -241,9 +273,40 @@ AudioPanel::film_content_changed (int property) setup_sensitivity (); } else if (property == ContentProperty::VIDEO_FRAME_RATE) { setup_description (); + } else if (property == AudioContentProperty::FADE_IN) { + set 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 { + _fade_in->clear (); + } + } else if (property == AudioContentProperty::FADE_OUT) { + set 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 () { @@ -275,6 +338,7 @@ AudioPanel::gain_calculate_button_clicked () d->Destroy (); } + void AudioPanel::setup_description () { @@ -287,6 +351,7 @@ AudioPanel::setup_description () checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } + void AudioPanel::mapping_changed (AudioMapping m) { @@ -296,6 +361,7 @@ AudioPanel::mapping_changed (AudioMapping m) } } + void AudioPanel::content_selection_changed () { @@ -306,11 +372,15 @@ AudioPanel::content_selection_changed () film_content_changed (AudioContentProperty::STREAMS); film_content_changed (AudioContentProperty::GAIN); + 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 () { @@ -334,6 +404,8 @@ AudioPanel::setup_sensitivity () 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 c) { return static_cast(c->video); }); + _gain->wrapped()->Enable (!ref); _gain_calculate_button->Enable (!ref && single); _show->Enable (single); @@ -341,8 +413,12 @@ AudioPanel::setup_sensitivity () _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 () { @@ -360,6 +436,7 @@ AudioPanel::show_clicked () _audio_dialog->Show (); } + /** @return If there is one selected piece of audio content, return its peak value in dB (if known) */ optional AudioPanel::peak () const @@ -371,8 +448,18 @@ AudioPanel::peak () const auto playlist = make_shared(); playlist->add (_parent->film(), sel.front()); try { - auto analysis = make_shared(_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(path); + peak_dB = linear_to_db(analysis->overall_sample_peak().first.peak) + analysis->gain_correction(playlist); + _peak_cache[path] = *peak_dB; + } } catch (...) { } @@ -381,6 +468,7 @@ AudioPanel::peak () const return peak_dB; } + void AudioPanel::setup_peak () { @@ -409,6 +497,7 @@ AudioPanel::setup_peak () } } + void AudioPanel::active_jobs_changed (optional old_active, optional new_active) { @@ -420,6 +509,7 @@ AudioPanel::active_jobs_changed (optional old_active, optional n } } + void AudioPanel::reference_clicked () { @@ -436,6 +526,7 @@ AudioPanel::reference_clicked () d->set_reference_audio (_reference->GetValue ()); } + void AudioPanel::set_film (shared_ptr) { @@ -446,3 +537,34 @@ AudioPanel::set_film (shared_ptr) } } + +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::fade_out_changed () +{ + 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::use_same_fades_as_video_changed () +{ + for (auto content: _parent->selected_audio()) { + content->audio->set_use_same_fades_as_video(_use_same_fades_as_video->GetValue()); + } +} +