/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
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
*/
-#include <boost/filesystem.hpp>
-#include "lib/audio_analysis.h"
-#include "lib/film.h"
-#include "lib/audio_content.h"
#include "audio_dialog.h"
#include "audio_plot.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 <boost/filesystem.hpp>
using boost::shared_ptr;
using boost::bind;
using boost::optional;
-AudioDialog::AudioDialog (wxWindow* parent)
+AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> 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 | 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);
+ lr_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_AUDIO_CHANNELS; ++i) {
+ 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[] = {
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);
+ lr_sizer->Add (right, 0, wxALL, 12);
- SetSizer (sizer);
- sizer->Layout ();
- sizer->SetSizeHints (this);
-}
+ overall_sizer->Add (lr_sizer);
-void
-AudioDialog::set_content (shared_ptr<AudioContent> c)
-{
- _content_changed_connection.disconnect ();
-
- _content = c;
-
- try_to_load_analysis ();
- _plot->set_gain (_content->audio_gain ());
+#ifdef DCPOMATIC_LINUX
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+ if (buttons) {
+ overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+#endif
- _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
+ SetSizer (overall_sizer);
+ overall_sizer->Layout ();
+ overall_sizer->SetSizeHints (this);
- SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path().filename().string()).data()));
+ _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this));
+ SetTitle (_("DCP-o-matic audio"));
}
void
if (!IsShown ()) {
return;
}
-
- if (!boost::filesystem::exists (_content->audio_analysis_path())) {
- _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+
+ boost::filesystem::path path = film->audio_analysis_path ();
+
+ if (!boost::filesystem::exists (path)) {
+ _plot->set_analysis (shared_ptr<AudioAnalysis> ());
+ _analysis.reset ();
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
+ JobManager::instance()->add (job);
return;
}
+
+ try {
+ _analysis.reset (new AudioAnalysis (path));
+ } catch (xmlpp::exception& e) {
+ /* Probably an old-style analysis file: recreate it */
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
+ JobManager::instance()->add (job);
+ return;
+ }
- shared_ptr<AudioAnalysis> 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
AudioDialog::analysis_finished ()
{
- if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+ shared_ptr<const Film> 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.
*/
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);
_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
}
void
AudioDialog::content_changed (int p)
{
- if (p == AudioContentProperty::AUDIO_GAIN) {
- _plot->set_gain (_content->audio_gain ());
+ if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) {
+ try_to_load_analysis ();
}
}
++t;
}
- assert (t < AudioPoint::COUNT);
+ DCPOMATIC_ASSERT (t < AudioPoint::COUNT);
_plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
}
{
_plot->set_smoothing (_smoothing->GetValue ());
}
+
+void
+AudioDialog::setup_peak_time ()
+{
+ if (!_analysis || !_analysis->peak ()) {
+ return;
+ }
+
+ shared_ptr<Film> 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;
+}
+
+
projects / dcpomatic.git / blobdiff