Expand cinema when adding a screen in the KDM window.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index fd523aa02057680f205564a4cac08659d6cac9f1..17d50ef693a1dd4e713d96876eacb3bf86db3699 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -27,11 +27,15 @@
 #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)
@@ -107,8 +111,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,12 +132,12 @@ 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 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;
@@ -136,13 +147,14 @@ 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));
+               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 */
@@ -178,7 +190,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 +217,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 (gain_correction ());
+                       setup_peak_time ();
+               } else {
+                       try_to_load_analysis ();
+               }
        }
 }
 
@@ -241,7 +263,7 @@ AudioDialog::setup_peak_time ()
                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 (
@@ -266,4 +288,21 @@ AudioDialog::Show (bool show)
        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;
+}