X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=8c015ab68fabf5d95496f1b98ce2ba9cbc48b6e9;hb=00ae2c28501bb757a6a45ba47ad4ecbe32412933;hp=2117963f62569e0ad9e06f653f8065e544651495;hpb=6a33727b656e3adb9bf3a8fb5a6998e0b4906db7;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 2117963f6..8c015ab68 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,19 +28,41 @@ #include "lib/job_manager.h" #include #include +#include #include using std::cout; +using std::list; +using std::vector; +using std::pair; using boost::shared_ptr; using boost::bind; using boost::optional; using boost::const_pointer_cast; using boost::dynamic_pointer_cast; -/** @param content Content to analyse, or 0 to analyse all of the film's audio */ -AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptr content) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) +/** @param parent Parent window. + * @param film Film we are using. + * @param content Content to analyse, or 0 to analyse all of the film's audio. + */ +AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptr content) + : wxDialog ( + parent, + wxID_ANY, + _("Audio"), + wxDefaultPosition, + wxSize (640, 512), +#ifdef DCPOMATIC_OSX + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP +#else + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT +#endif + ) , _film (film) + , _content (content) , _channels (film->audio_channels ()) , _plot (0) { @@ -51,6 +74,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); _plot = new AudioPlot (this); left->Add (_plot, 1, wxTOP | wxEXPAND, 12); _sample_peak = new wxStaticText (this, wxID_ANY, wxT ("")); @@ -62,7 +87,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); - lr_sizer->Add (left, 1, wxALL, 12); + lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12); wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); @@ -74,8 +99,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrSetForegroundColour(wxColour(_plot->colour(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)); + _channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1)); + } + + for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) { + _channel_checkbox[i] = 0; } { @@ -92,7 +122,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); - _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1)); + _type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1)); } { @@ -107,7 +137,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (right, 0, wxALL, 12); - overall_sizer->Add (lr_sizer); + overall_sizer->Add (lr_sizer, 0, wxEXPAND); #ifdef DCPOMATIC_LINUX wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); @@ -121,7 +151,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrSetSizeHints (this); _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2)); - SetTitle (_("DCP-o-matic audio")); + DCPOMATIC_ASSERT (film->directory()); + SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string()))); if (content) { _playlist.reset (new Playlist ()); @@ -129,6 +160,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrplaylist (); } + + _plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2)); } void @@ -141,19 +174,31 @@ AudioDialog::try_to_load_analysis () shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); + shared_ptr check = _content.lock(); + boost::filesystem::path const path = film->audio_analysis_path (_playlist); if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr ()); _analysis.reset (); - JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->analyse_audio ( + film, _playlist, !static_cast(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this) + ); return; } try { _analysis.reset (new AudioAnalysis (path)); + } catch (OldFormatError& e) { + /* An old analysis file: recreate it */ + JobManager::instance()->analyse_audio ( + film, _playlist, !static_cast(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this) + ); + return; } catch (xmlpp::exception& e) { - /* Probably an old-style analysis file: recreate it */ - JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); + /* Probably a (very) old-style analysis file: recreate it */ + JobManager::instance()->analyse_audio ( + film, _playlist, !static_cast(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this) + ); return; } @@ -168,9 +213,24 @@ AudioDialog::try_to_load_analysis () ++i; } - if (i == _channels && _channel_checkbox[0]) { - _channel_checkbox[0]->SetValue (true); - _plot->set_channel_visible (0, true); + if (i == _channels) { + /* Nothing checked; check mapped ones */ + + list mapped; + shared_ptr content = _content.lock (); + + if (content) { + mapped = content->audio->mapping().mapped_output_channels (); + } else { + mapped = film->mapped_audio_channels (); + } + + BOOST_FOREACH (int i, mapped) { + if (_channel_checkbox[i]) { + _channel_checkbox[i]->SetValue (true); + _plot->set_channel_visible (i, true); + } + } } i = 0; @@ -192,7 +252,10 @@ void AudioDialog::analysis_finished () { shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + if (!film) { + /* This should not happen, but if it does we should just give up quietly */ + return; + } if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) { /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. @@ -221,9 +284,9 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) void AudioDialog::content_changed (int p) { - if (p == AudioContentProperty::AUDIO_STREAMS) { + if (p == AudioContentProperty::STREAMS) { try_to_load_analysis (); - } else if (p == AudioContentProperty::AUDIO_GAIN) { + } else if (p == AudioContentProperty::GAIN) { if (_playlist->content().size() == 1 && _analysis) { /* We can use a short-cut to render the effect of this change, rather than recalculating everything. @@ -267,27 +330,26 @@ AudioDialog::setup_statistics () return; } - if (static_cast(_analysis->sample_peak ())) { - - float const peak_dB = 20 * log10 (_analysis->sample_peak().get()) + _analysis->gain_correction (_playlist); - - _sample_peak->SetLabel ( - wxString::Format ( - _("Sample peak is %.2fdB at %s"), - peak_dB, - time_to_timecode (_analysis->sample_peak_time().get(), film->video_frame_rate ()).data () - ) - ); - - if (peak_dB > -3) { - _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); - } else { - _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); - } + pair const peak = _analysis->overall_sample_peak (); + float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist); + _sample_peak->SetLabel ( + wxString::Format ( + _("Sample peak is %.2fdB at %s on %s"), + peak_dB, + time_to_timecode (peak.first.time, film->video_frame_rate ()).data (), + std_to_wx (short_audio_channel_name (peak.second)).data () + ) + ); + + if (peak_dB > -3) { + _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); + } else { + _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); } - if (static_cast(_analysis->true_peak ())) { - float const peak_dB = 20 * log10 (_analysis->true_peak().get()) + _analysis->gain_correction (_playlist); + if (_analysis->overall_true_peak()) { + float const peak = _analysis->overall_true_peak().get(); + float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist); _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB)); @@ -326,3 +388,16 @@ AudioDialog::Show (bool show) try_to_load_analysis (); return r; } + +void +AudioDialog::set_cursor (optional time, optional db) +{ + if (!time || !db) { + _cursor->SetLabel (_("Cursor: none")); + return; + } + + shared_ptr film = _film.lock(); + DCPOMATIC_ASSERT (film); + _cursor->SetLabel (wxString::Format (_("Cursor: %.1fdB at %s"), *db, time->timecode(film->video_frame_rate()))); +}