Peak value of audio into the audio tab.

[dcpomatic.git] / src / wx / audio_dialog.cc

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index fd523aa02057680f205564a4cac08659d6cac9f1..27b34540611dd76cf94a0af46b1649022e1efe20 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -25,13 +25,18 @@
 #include "lib/analyse_audio_job.h"
 #include "lib/audio_content.h"
 #include "lib/job_manager.h"
+#include <libxml++/libxml++.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)
@@ -107,8 +112,15 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
        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
@@ -121,14 +133,11 @@ AudioDialog::try_to_load_analysis ()
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
-       boost::filesystem::path path = film->audio_analysis_path ();
-
+       boost::filesystem::path const 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));
-               _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
-               JobManager::instance()->add (job);
+               JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
                return;
        }
 
@@ -136,13 +145,12 @@ AudioDialog::try_to_load_analysis ()
                _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);
+               JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
                return;
         }
 
        _plot->set_analysis (_analysis);
+       _plot->set_gain_correction (_analysis->gain_correction (_playlist));
        setup_peak_time ();
 
        /* Set up some defaults if no check boxes are checked */
@@ -178,7 +186,7 @@ AudioDialog::analysis_finished ()
        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.
                */
@@ -205,8 +213,18 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 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 (_analysis->gain_correction (_playlist));
+                       setup_peak_time ();
+               } else {
+                       try_to_load_analysis ();
+               }
        }
 }
 
@@ -241,7 +259,7 @@ AudioDialog::setup_peak_time ()
                return;
        }
 
-       float peak_dB = 20 * log10 (_analysis->peak().get());
+       float const peak_dB = 20 * log10 (_analysis->peak().get()) + _analysis->gain_correction (_playlist);
 
        _peak_time->SetLabel (
                wxString::Format (
@@ -265,5 +283,3 @@ AudioDialog::Show (bool show)
        try_to_load_analysis ();
        return r;
 }
-
-