Remove unnecessary Playlist argument to Film::audio_analysis_path.

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 8800e2657784d4e0516c8f77141335bd2e36a2ee..98bed30dcab22e89a97a322684dc3c3666d04549 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -88,7 +88,7 @@ AnalyseAudioJob::run ()
        }
 
        _analysis->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ()));
-       _analysis->write (_film->audio_analysis_path (_playlist));
+       _analysis->write (_film->audio_analysis_path ());
        
        set_progress (1);
        set_state (FINISHED_OK);

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a0caade8e58495dd23922ef8d8eb980eeaeb3c29..769ef72b6f56b2337469cde50c61a86d439fd170 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -249,12 +249,12 @@ Film::filename_safe_name () const
 }
 
 boost::filesystem::path
-Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
+Film::audio_analysis_path () const
 {
        boost::filesystem::path p = dir ("analysis");
 
        MD5Digester digester;
-       BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
+       BOOST_FOREACH (shared_ptr<Content> i, content ()) {
                shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i);
                if (!ac) {
                        continue;

diff --git a/src/lib/film.h b/src/lib/film.h
index ac25323b932cae277acb3e149b9f4c9108ca144b..da1c09d2fa5739e2f209b2d9cb3bb97831ea2769 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -69,7 +69,7 @@ public:
        boost::filesystem::path internal_video_asset_dir () const;
        boost::filesystem::path internal_video_asset_filename () const;
 
-       boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
+       boost::filesystem::path audio_analysis_path () const;
 
        void send_dcp_to_tms ();
        void make_dcp ();

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 7a13a24a08b54e51d8ae19f0b4a43e02383c41f8..b4def55d39fc8acc265957373a4e6aa503a64ff2 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -128,7 +128,7 @@ AudioDialog::try_to_load_analysis ()
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
-       boost::filesystem::path path = film->audio_analysis_path (_playlist);
+       boost::filesystem::path path = film->audio_analysis_path ();
 
        if (!boost::filesystem::exists (path)) {
                _plot->set_analysis (shared_ptr<AudioAnalysis> ());
@@ -185,7 +185,7 @@ AudioDialog::analysis_finished ()
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
        
-       if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) {
+       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.
                */