X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=fd523aa02057680f205564a4cac08659d6cac9f1;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=701c8263a48b27e8a8391da28865eae1fb516dc1;hpb=2eb98dd87bb359ae333247af55b650fced7f6311;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 701c8263a..fd523aa02 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 @@ -17,37 +17,59 @@ */ -#include #include "audio_dialog.h" #include "audio_plot.h" -#include "audio_analysis.h" -#include "film.h" #include "wx_util.h" +#include "lib/audio_analysis.h" +#include "lib/film.h" +#include "lib/analyse_audio_job.h" +#include "lib/audio_content.h" +#include "lib/job_manager.h" +#include using boost::shared_ptr; using boost::bind; using boost::optional; -AudioDialog::AudioDialog (wxWindow* parent) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +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) { - wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL); + + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); _plot = new AudioPlot (this); - sizer->Add (_plot, 1, wxALL, 12); + left->Add (_plot, 1, wxALL | wxEXPAND, 12); + _peak_time = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_peak_time, 0, wxALL, 12); + + lr_sizer->Add (left, 1, wxALL, 12); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i)); - table->Add (_channel_checkbox[i], 1, wxEXPAND); - table->AddSpacer (0); - _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); } - table->AddSpacer (0); - table->AddSpacer (0); + 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))); + 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")); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } wxString const types[] = { _("Peak"), @@ -56,113 +78,135 @@ AudioDialog::AudioDialog (wxWindow* parent) for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); - table->Add (_type_checkbox[i], 1, wxEXPAND); - table->AddSpacer (0); - _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this); + right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); + _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1)); } - sizer->Add (table, 0, wxALL, 12); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); -} + _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)); + right->Add (_smoothing, 0, wxEXPAND); -void -AudioDialog::set_film (boost::shared_ptr f) -{ - _film_changed_connection.disconnect (); - _film_audio_analysis_finished_connection.disconnect (); - - _film = f; + lr_sizer->Add (right, 0, wxALL, 12); - try_to_load_analysis (); - setup_channels (); - _plot->set_gain (_film->audio_gain ()); + overall_sizer->Add (lr_sizer); - _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); - _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this)); +#ifdef DCPOMATIC_LINUX + wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } +#endif + + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); - SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name())); + _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this)); + SetTitle (_("DCP-o-matic audio")); } void -AudioDialog::setup_channels () +AudioDialog::try_to_load_analysis () { - if (!_film->audio_stream()) { + if (!IsShown ()) { return; } - AudioMapping m (_film->audio_stream()->channels ()); - - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - if (m.dcp_to_source(static_cast(i))) { - _channel_checkbox[i]->Show (); - } else { - _channel_checkbox[i]->Hide (); - } + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + boost::filesystem::path path = film->audio_analysis_path (); + + if (!boost::filesystem::exists (path)) { + _plot->set_analysis (shared_ptr ()); + _analysis.reset (); + shared_ptr job (new AnalyseAudioJob (film)); + _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->add (job); + return; } -} -void -AudioDialog::try_to_load_analysis () -{ - shared_ptr a; + try { + _analysis.reset (new AudioAnalysis (path)); + } catch (xmlpp::exception& e) { + /* Probably an old-style analysis file: recreate it */ + shared_ptr job (new AnalyseAudioJob (film)); + _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->add (job); + return; + } - if (boost::filesystem::exists (_film->audio_analysis_path())) { - a.reset (new AudioAnalysis (_film->audio_analysis_path ())); - } else { - if (IsShown ()) { - _film->analyse_audio (); - } + _plot->set_analysis (_analysis); + setup_peak_time (); + + /* Set up some defaults if no check boxes are checked */ + + int i = 0; + while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) { + ++i; } - - _plot->set_analysis (a); - AudioMapping m (_film->audio_stream()->channels ()); - optional c = m.source_to_dcp (0); - if (c) { - _channel_checkbox[c.get()]->SetValue (true); + if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) { + _channel_checkbox[0]->SetValue (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 +AudioDialog::analysis_finished () +{ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + if (!boost::filesystem::exists (film->audio_analysis_path ())) { + /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. + Give up. + */ + _plot->set_message (_("Could not analyse audio.")); + return; } + + try_to_load_analysis (); } void AudioDialog::channel_clicked (wxCommandEvent& ev) { int c = 0; - while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { + while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { ++c; } - assert (c < MAX_AUDIO_CHANNELS); + DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS); - AudioMapping m (_film->audio_stream()->channels ()); - optional s = m.dcp_to_source (static_cast (c)); - if (s) { - _plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ()); - } + _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } void -AudioDialog::film_changed (Film::Property p) +AudioDialog::content_changed (int p) { - switch (p) { - case Film::AUDIO_GAIN: - _plot->set_gain (_film->audio_gain ()); - break; - case Film::CONTENT_AUDIO_STREAM: - case Film::EXTERNAL_AUDIO: - case Film::USE_CONTENT_AUDIO: - setup_channels (); - break; - default: - break; + if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) { + try_to_load_analysis (); } } @@ -174,7 +218,52 @@ AudioDialog::type_clicked (wxCommandEvent& ev) ++t; } - assert (t < AudioPoint::COUNT); + DCPOMATIC_ASSERT (t < AudioPoint::COUNT); _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); } + +void +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()); + + _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)); + } +} + +bool +AudioDialog::Show (bool show) +{ + bool const r = wxDialog::Show (show); + try_to_load_analysis (); + return r; +} + +