#include "lib/job_manager.h"
#include <boost/filesystem.hpp>
+using std::cout;
using boost::shared_ptr;
using boost::bind;
using boost::optional;
+using boost::const_pointer_cast;
+using boost::dynamic_pointer_cast;
-AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
+/** @param content Content to analyse, or 0 to analyse all of the film's audio */
+AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<AudioContent> content)
: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
, _film (film)
, _plot (0)
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL);
-
+
wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
_plot = new AudioPlot (this);
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
-
+
wxString const types[] = {
_("Peak"),
_("RMS")
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));
right->Add (_smoothing, 0, wxEXPAND);
overall_sizer->Add (lr_sizer);
-#ifdef DCPOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
if (buttons) {
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
-#endif
+#endif
SetSizer (overall_sizer);
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
- _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this));
+ _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2));
SetTitle (_("DCP-o-matic audio"));
+
+ if (content) {
+ _playlist.reset (new Playlist ());
+ const_pointer_cast<Playlist> (_playlist)->add (content);
+ } else {
+ _playlist = film->playlist ();
+ }
}
void
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
- boost::filesystem::path path = film->audio_analysis_path ();
+ boost::filesystem::path path = film->audio_analysis_path (_playlist);
if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
_analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
JobManager::instance()->add (job);
return;
_analysis.reset (new AudioAnalysis (path));
} catch (xmlpp::exception& e) {
/* Probably an old-style analysis file: recreate it */
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
_analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
JobManager::instance()->add (job);
return;
}
-
+
_plot->set_analysis (_analysis);
+ _plot->set_gain_correction (gain_correction ());
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;
{
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
-
- if (!boost::filesystem::exists (film->audio_analysis_path ())) {
+
+ if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) {
/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
Give up.
*/
void
AudioDialog::content_changed (int p)
{
- if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) {
+ if (p == AudioContentProperty::AUDIO_STREAMS) {
try_to_load_analysis ();
+ } else if (p == AudioContentProperty::AUDIO_GAIN) {
+ if (_playlist->content().size() == 1) {
+ /* We can use a short-cut to render the effect of this
+ change, rather than recalculating everything.
+ */
+ _plot->set_gain_correction (gain_correction ());
+ setup_peak_time ();
+ } else {
+ try_to_load_analysis ();
+ }
}
}
if (!_analysis || !_analysis->peak ()) {
return;
}
-
+
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
-
- float peak_dB = 20 * log10 (_analysis->peak().get());
-
+
+ float const peak_dB = 20 * log10 (_analysis->peak().get()) + gain_correction ();
+
_peak_time->SetLabel (
wxString::Format (
_("Peak is %.2fdB at %s"),
time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data ()
)
);
-
+
if (peak_dB > -3) {
_peak_time->SetForegroundColour (wxColour (255, 0, 0));
} else {
}
}
-void
-AudioDialog::Show ()
+bool
+AudioDialog::Show (bool show)
{
- wxDialog::Show ();
+ bool const r = wxDialog::Show (show);
try_to_load_analysis ();
+ return r;
}
-
+/** @return gain correction in dB required to be added to raw gain values to render
+ * the dialog correctly.
+ */
+float
+AudioDialog::gain_correction ()
+{
+ if (_playlist->content().size() == 1 && _analysis->analysis_gain ()) {
+ /* In this case we know that the analysis was of a single piece of content and
+ we know that content's gain when the analysis was run. Hence we can work out
+ what correction is now needed to make it look `right'.
+ */
+ shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (_playlist->content().front ());
+ DCPOMATIC_ASSERT (ac);
+ return ac->audio_gain() - _analysis->analysis_gain().get ();
+ }
+
+ return 0.0f;
+}
projects / dcpomatic.git / blobdiff