Re-add show audio button and analyse just that content when it is clicked.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index c2afb53dc77f454cee2df277663ba008fdbaa5b9..cd59693eab61ae8bfbaecefbcf8af99610e39d5a 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -30,8 +30,10 @@
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
+using boost::const_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)
@@ -41,7 +43,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL);
-       
+
        wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
 
        _plot = new AudioPlot (this);
@@ -70,7 +72,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
                m->SetFont (subheading_font);
                right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
        }
-       
+
        wxString const types[] = {
                _("Peak"),
                _("RMS")
@@ -87,7 +89,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
                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);
@@ -96,12 +98,12 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
 
        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 ();
@@ -109,6 +111,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
 
        _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this));
        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 +130,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,17 +145,17 @@ 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);
        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;
@@ -177,8 +186,8 @@ 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.
                */
@@ -235,14 +244,14 @@ 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"),
@@ -250,7 +259,7 @@ AudioDialog::setup_peak_time ()
                        time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data ()
                        )
                );
-       
+
        if (peak_dB > -3) {
                _peak_time->SetForegroundColour (wxColour (255, 0, 0));
        } else {
@@ -258,11 +267,10 @@ AudioDialog::setup_peak_time ()
        }
 }
 
-void
-AudioDialog::Show ()
+bool
+AudioDialog::Show (bool show)
 {
-       wxDialog::Show ();
+       bool const r = wxDialog::Show (show);
        try_to_load_analysis ();
+       return r;
 }
-
-