X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=ccdb579079dc166ef79acc1269760de64ae2f0ea;hb=63c1bbc1ba177600523b2257223070cc2dbde7b7;hp=c250e99141939ba960271bfffba0626568fd2914;hpb=401af8742fe5b2bb3ec117acdc4b0b36bc8f5047;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index c250e9914..ccdb57907 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,9 @@ #include "gain_calculator_dialog.h" #include "content_panel.h" #include "audio_dialog.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" #include "lib/config.h" #include "lib/ffmpeg_audio_stream.h" #include "lib/ffmpeg_content.h" @@ -48,16 +51,16 @@ AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) , _audio_dialog (0) { - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF")); - _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _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...")); - _peak = new wxStaticText (this, wxID_ANY, wxT ("")); + _show = new Button (this, _("Show graph of audio levels...")); + _peak = new StaticText (this, wxT ("")); _gain_label = create_label (this, _("Gain"), true); _gain = new ContentSpinCtrlDouble ( @@ -70,7 +73,7 @@ AudioPanel::AudioPanel (ContentPanel* p) ); _gain_db_label = create_label (this, _("dB"), false); - _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate...")); + _gain_calculate_button = new Button (this, _("Calculate...")); _delay_label = create_label (this, _("Delay"), true); _delay = new ContentSpinCtrl ( @@ -88,7 +91,7 @@ AudioPanel::AudioPanel (ContentPanel* p) _mapping = new AudioMappingView (this); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); - _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize); + _description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize); _sizer->Add (_description, 0, wxALL, 12); _description->SetFont (font); @@ -107,8 +110,7 @@ AudioPanel::AudioPanel (ContentPanel* p) _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)); - - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2)); + _active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2)); add_to_grid (); } @@ -116,17 +118,17 @@ AudioPanel::AudioPanel (ContentPanel* p) void AudioPanel::add_to_grid () { - Config::Interface const interface = Config::instance()->interface_complexity(); + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; int r = 0; - _reference->Show (interface == Config::INTERFACE_FULL); - _reference_note->Show (interface == Config::INTERFACE_FULL); + _reference->Show (full); + _reference_note->Show (full); - if (interface == Config::INTERFACE_FULL) { + if (full) { wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP); - reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4)); ++r; } @@ -136,15 +138,32 @@ AudioPanel::add_to_grid () ++r; add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0)); - _gain->add (_grid, wxGBPosition(r, 1)); - add_label_to_sizer (_grid, _gain_db_label, false, wxGBPosition(r, 2)); - _grid->Add (_gain_calculate_button, wxGBPosition(r, 3)); - ++r; + { + 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)); + } - add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0)); - _delay->add (_grid, wxGBPosition (r, 1)); - add_label_to_sizer (_grid, _delay_ms_label, false, wxGBPosition(r, 2)); - ++r; + _gain_calculate_button->Show (full); + + if (full) { + _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; + } + + _delay_label->Show (full); + _delay->show (full); + _delay_ms_label->Show (full); + + if (full) { + 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 () @@ -158,6 +177,10 @@ AudioPanel::~AudioPanel () void AudioPanel::film_changed (Film::Property property) { + if (!_parent->film()) { + return; + } + switch (property) { case Film::AUDIO_CHANNELS: case Film::AUDIO_PROCESSOR: @@ -258,7 +281,7 @@ AudioPanel::setup_description () return; } - checked_set (_description, ac.front()->audio->processing_description ()); + checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } void @@ -296,7 +319,7 @@ AudioPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_audio (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 ()) { @@ -345,7 +368,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);