: 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, _("Refer to existing DCP"));
- grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
- ++r;
+ _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF"));
+ _reference_note = new wxStaticText (this, wxID_ANY, 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;
- add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+ _gain_label = create_label (this, _("Gain"), true);
_gain = new ContentSpinCtrlDouble<AudioContent> (
this,
new wxSpinCtrlDouble (this),
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<AudioContent> (
this,
new wxSpinCtrl (this),
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);
_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);
- _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioPanel::reference_clicked, this));
- _show->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::show_clicked, this));
- _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
+ 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));
+
+ 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);
- JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1));
+ ++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 ()
case Film::REEL_TYPE:
case Film::INTEROP:
setup_sensitivity ();
+ break;
default:
break;
}
return;
}
- checked_set (_description, ac.front()->audio->processing_description ());
+ checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
}
void
_delay->set_content (sel);
film_content_changed (AudioContentProperty::STREAMS);
+ film_content_changed (AudioContentProperty::GAIN);
film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
setup_sensitivity ();
dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
}
- list<string> 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);
AudioPanel::setup_peak ()
{
ContentList sel = _parent->selected_audio ();
- bool alert = false;
+ optional<float> peak_dB;
if (sel.size() != 1) {
_peak->SetLabel (wxT (""));
} else {
shared_ptr<Playlist> playlist (new Playlist);
- playlist->add (sel.front ());
+ playlist->add (_parent->film(), sel.front());
try {
shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
- if (analysis->sample_peak ()) {
- float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist);
- if (peak_dB > -3) {
- alert = true;
- }
- _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB));
- } else {
- _peak->SetLabel (_("Peak: unknown"));
- }
+ peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);
+ _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), *peak_dB));
} catch (...) {
_peak->SetLabel (_("Peak: unknown"));
}
static wxColour normal = _peak->GetForegroundColour ();
- if (alert) {
+ if (peak_dB && *peak_dB > -0.5) {
_peak->SetForegroundColour (wxColour (255, 0, 0));
+ } else if (peak_dB && *peak_dB > -3) {
+ _peak->SetForegroundColour (wxColour (186, 120, 0));
} else {
_peak->SetForegroundColour (normal);
}
}
void
-AudioPanel::active_jobs_changed (optional<string> j)
+AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> 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);
}
}
projects / dcpomatic.git / blobdiff