X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=34292620b48a9d7561fca29cf0d47ec3bb3313fa;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=fd63abf6ca050b9624e799db0438abb3d4be2dab;hpb=462ecb47dfbcbcc020a955a8592f55ec2dd9b5aa;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index fd63abf6c..34292620b 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,8 @@ #include "gain_calculator_dialog.h" #include "content_panel.h" #include "audio_dialog.h" +#include "static_text.h" +#include "check_box.h" #include "lib/config.h" #include "lib/ffmpeg_audio_stream.h" #include "lib/ffmpeg_content.h" @@ -48,22 +50,18 @@ AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) , _audio_dialog (0) { - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (grid, 0, wxALL, 8); - - int r = 0; - - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF")); - grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 3)); - ++r; + _reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF")); + _reference_note = new StaticText (this, wxT("")); + _reference_note->Wrap (200); + wxFont font = _reference_note->GetFont(); + font.SetStyle(wxFONTSTYLE_ITALIC); + font.SetPointSize(font.GetPointSize() - 1); + _reference_note->SetFont(font); _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels...")); - grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2)); - _peak = new wxStaticText (this, wxID_ANY, wxT ("")); - grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); - ++r; + _peak = new StaticText (this, wxT ("")); - add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); + _gain_label = create_label (this, _("Gain"), true); _gain = new ContentSpinCtrlDouble ( this, new wxSpinCtrlDouble (this), @@ -73,13 +71,10 @@ AudioPanel::AudioPanel (ContentPanel* p) boost::mem_fn (&AudioContent::set_gain) ); - _gain->add (grid, wxGBPosition (r, 1)); - add_label_to_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2)); + _gain_db_label = create_label (this, _("dB"), false); _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate...")); - grid->Add (_gain_calculate_button, wxGBPosition (r, 3)); - ++r; - add_label_to_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); + _delay_label = create_label (this, _("Delay"), true); _delay = new ContentSpinCtrl ( this, new wxSpinCtrl (this), @@ -89,35 +84,77 @@ AudioPanel::AudioPanel (ContentPanel* p) boost::mem_fn (&AudioContent::set_delay) ); - _delay->add (grid, wxGBPosition (r, 1)); /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time - add_label_to_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2)); - ++r; + _delay_ms_label = create_label (this, _("ms"), false); _mapping = new AudioMappingView (this); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); - ++r; - _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize); + _description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize); _sizer->Add (_description, 0, wxALL, 12); - wxFont font = _description->GetFont(); - font.SetStyle (wxFONTSTYLE_ITALIC); - font.SetPointSize (font.GetPointSize() - 1); _description->SetFont (font); - ++r; _gain->wrapped()->SetRange (-60, 60); _gain->wrapped()->SetDigits (1); _gain->wrapped()->SetIncrement (0.5); _delay->wrapped()->SetRange (-1000, 1000); + content_selection_changed (); + film_changed (Film::AUDIO_CHANNELS); + film_changed (Film::VIDEO_FRAME_RATE); + film_changed (Film::REEL_TYPE); + _reference->Bind (wxEVT_CHECKBOX, boost::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)); _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)); - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); + add_to_grid (); +} + +void +AudioPanel::add_to_grid () +{ + Config::Interface const interface = Config::instance()->interface_complexity(); + + int r = 0; + + _reference->Show (interface == Config::INTERFACE_FULL); + _reference_note->Show (interface == Config::INTERFACE_FULL); + + if (interface == Config::INTERFACE_FULL) { + wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); + _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4)); + ++r; + } + + _grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); + ++r; + + add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition(r, 1)); + } + _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + + ++r; + + add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition(r, 1)); + } + ++r; } AudioPanel::~AudioPanel () @@ -231,7 +268,7 @@ AudioPanel::setup_description () return; } - checked_set (_description, ac.front()->audio->processing_description ()); + checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } void @@ -252,6 +289,7 @@ AudioPanel::content_selection_changed () _delay->set_content (sel); film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (AudioContentProperty::GAIN); film_content_changed (DCPContentProperty::REFERENCE_AUDIO); setup_sensitivity (); @@ -267,9 +305,9 @@ AudioPanel::setup_sensitivity () dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; - bool const can_reference = dcp && dcp->can_reference_audio (why_not); - setup_refer_button (_reference, dcp, can_reference, why_not); + string why_not; + bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), why_not); + setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); if (_reference->GetValue ()) { _gain->wrapped()->Enable (false); @@ -317,7 +355,7 @@ AudioPanel::setup_peak () _peak->SetLabel (wxT ("")); } else { shared_ptr playlist (new Playlist); - playlist->add (sel.front ()); + playlist->add (_parent->film(), sel.front()); try { shared_ptr analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist))); peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist); @@ -339,10 +377,13 @@ AudioPanel::setup_peak () } void -AudioPanel::active_jobs_changed (optional j) +AudioPanel::active_jobs_changed (optional old_active, optional new_active) { - if (j && *j == "analyse_audio") { + if (old_active && *old_active == "analyse_audio") { setup_peak (); + _mapping->Enable (true); + } else if (new_active && *new_active == "analyse_audio") { + _mapping->Enable (false); } }