X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=11de9586b4d62fc441c1f915375a35a9228db1f7;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=0e1316cf31979f21d3ec4790f1a3ba5bb7154461;hpb=5eacf5f4805181617e486805ab5d07ccf5e21cde;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 0e1316cf3..11de9586b 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,31 +29,43 @@ using boost::shared_ptr; using boost::bind; using boost::optional; -AudioDialog::AudioDialog (wxWindow* parent) +AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) + , _film (film) , _plot (0) { + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); + + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); _plot = new AudioPlot (this); - sizer->Add (_plot, 1, wxALL | wxEXPAND, 12); + left->Add (_plot, 1, wxALL | wxEXPAND, 12); + _peak_time = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_peak_time, 0, wxALL, 12); - wxBoxSizer* side = new wxBoxSizer (wxVERTICAL); + sizer->Add (left, 1, wxALL, 12); + + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); } for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i))); - side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3); + right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3); _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1)); } { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } wxString const types[] = { @@ -63,20 +75,21 @@ AudioDialog::AudioDialog (wxWindow* parent) for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); - side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3); + right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1)); } { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing); _smoothing->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&AudioDialog::smoothing_changed, this)); - side->Add (_smoothing, 1, wxEXPAND); + right->Add (_smoothing, 0, wxEXPAND); - sizer->Add (side, 0, wxALL, 12); + sizer->Add (right, 0, wxALL, 12); SetSizer (sizer); sizer->Layout (); @@ -106,24 +119,48 @@ AudioDialog::try_to_load_analysis () } if (!boost::filesystem::exists (_content->audio_analysis_path())) { + _plot->set_analysis (shared_ptr ()); + _analysis.reset (); _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this)); return; } + + try { + _analysis.reset (new AudioAnalysis (_content->audio_analysis_path ())); + } catch (xmlpp::exception& e) { + /* Probably an old-style analysis file: recreate it */ + _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this)); + return; + } - shared_ptr a; + _plot->set_analysis (_analysis); + setup_peak_time (); + + /* Set up some defaults if no check boxes are checked */ - a.reset (new AudioAnalysis (_content->audio_analysis_path ())); - _plot->set_analysis (a); + int i = 0; + while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) { + ++i; + } - if (_channel_checkbox[0]) { + if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) { _channel_checkbox[0]->SetValue (true); + _plot->set_channel_visible (0, true); } - _plot->set_channel_visible (0, true); - for (int i = 0; i < AudioPoint::COUNT; ++i) { - _type_checkbox[i]->SetValue (true); - _plot->set_type_visible (i, true); + i = 0; + while (i < AudioPoint::COUNT && !_type_checkbox[i]->GetValue ()) { + i++; + } + + if (i == AudioPoint::COUNT) { + for (int i = 0; i < AudioPoint::COUNT; ++i) { + _type_checkbox[i]->SetValue (true); + _plot->set_type_visible (i, true); + } } + + Refresh (); } void @@ -148,7 +185,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) ++c; } - assert (c < MAX_DCP_AUDIO_CHANNELS); + DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS); _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } @@ -158,6 +195,9 @@ AudioDialog::content_changed (int p) { if (p == AudioContentProperty::AUDIO_GAIN) { _plot->set_gain (_content->audio_gain ()); + setup_peak_time (); + } else if (p == AudioContentProperty::AUDIO_STREAMS) { + try_to_load_analysis (); } } @@ -169,7 +209,7 @@ AudioDialog::type_clicked (wxCommandEvent& ev) ++t; } - assert (t < AudioPoint::COUNT); + DCPOMATIC_ASSERT (t < AudioPoint::COUNT); _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); } @@ -179,3 +219,32 @@ AudioDialog::smoothing_changed () { _plot->set_smoothing (_smoothing->GetValue ()); } + +void +AudioDialog::setup_peak_time () +{ + if (!_analysis || !_analysis->peak ()) { + return; + } + + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + float peak_dB = 20 * log10 (_analysis->peak().get()) + _content->audio_gain(); + + _peak_time->SetLabel ( + wxString::Format ( + _("Peak is %.2fdB at %s"), + peak_dB, + time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data () + ) + ); + + if (peak_dB > -3) { + _peak_time->SetForegroundColour (wxColour (255, 0, 0)); + } else { + _peak_time->SetForegroundColour (wxColour (0, 0, 0)); + } +}