From b48d3719ae980fb8c8dccf4194154e0300565fbd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 17 Jun 2015 16:11:25 +0100
Subject: Remove unnecessary Playlist argument to Film::audio_analysis_path.

---
 src/lib/analyse_audio_job.cc | 2 +-
 src/lib/film.cc              | 4 ++--
 src/lib/film.h               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 8800e2657..98bed30dc 100644
--- 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 a0caade8e..769ef72b6 100644
--- 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 ac25323b9..da1c09d2f 100644
--- 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 ();
-- 
cgit v1.2.3