X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=cfea4f0264a5b8a55ea200e1b94de5ea11f9db89;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=59c9cd2a898549a5e07d71ba6ad8cb8a4ffe0bb4;hpb=e0255a64d22440d718e5512f34a4f21f0d37a21b;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 59c9cd2a8..cfea4f026 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -18,41 +18,56 @@ */ -#include "audio_panel.h" -#include "audio_mapping_view.h" -#include "wx_util.h" -#include "gain_calculator_dialog.h" -#include "content_panel.h" + #include "audio_dialog.h" -#include "static_text.h" +#include "audio_mapping_view.h" +#include "audio_panel.h" #include "check_box.h" +#include "content_panel.h" #include "dcpomatic_button.h" +#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 "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include -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; + 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("")); @@ -91,6 +106,14 @@ AudioPanel::AudioPanel (ContentPanel* p) /// 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); @@ -112,12 +135,19 @@ AudioPanel::AudioPanel (ContentPanel* p) _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)); add_to_grid (); + + _sizer->Layout (); } + void AudioPanel::add_to_grid () { @@ -136,7 +166,7 @@ AudioPanel::add_to_grid () add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0)); { auto s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP); s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL); _grid->Add (s, wxGBPosition(r, 1)); } @@ -146,12 +176,24 @@ AudioPanel::add_to_grid () add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0)); auto s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP); 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) { @@ -185,6 +227,7 @@ AudioPanel::film_changed (Film::Property property) } } + void AudioPanel::film_content_changed (int property) { @@ -215,7 +258,7 @@ AudioPanel::film_content_changed (int property) } setup_description (); setup_peak (); - _sizer->Layout (); + layout (); } else if (property == AudioContentProperty::GAIN) { setup_peak (); } else if (property == DCPContentProperty::REFERENCE_AUDIO) { @@ -229,9 +272,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 () { @@ -263,6 +337,7 @@ AudioPanel::gain_calculate_button_clicked () d->Destroy (); } + void AudioPanel::setup_description () { @@ -275,6 +350,7 @@ AudioPanel::setup_description () checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } + void AudioPanel::mapping_changed (AudioMapping m) { @@ -284,6 +360,7 @@ AudioPanel::mapping_changed (AudioMapping m) } } + void AudioPanel::content_selection_changed () { @@ -294,11 +371,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 () { @@ -319,25 +400,24 @@ 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); - } + 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); + _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 () { @@ -355,6 +435,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 @@ -376,6 +457,7 @@ AudioPanel::peak () const return peak_dB; } + void AudioPanel::setup_peak () { @@ -404,6 +486,7 @@ AudioPanel::setup_peak () } } + void AudioPanel::active_jobs_changed (optional old_active, optional new_active) { @@ -415,6 +498,7 @@ AudioPanel::active_jobs_changed (optional old_active, optional n } } + void AudioPanel::reference_clicked () { @@ -431,6 +515,7 @@ AudioPanel::reference_clicked () d->set_reference_audio (_reference->GetValue ()); } + void AudioPanel::set_film (shared_ptr) { @@ -440,3 +525,35 @@ AudioPanel::set_film (shared_ptr) _audio_dialog = nullptr; } } + + +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()); + } +} +