From: Carl Hetherington <cth@carlh.net>
Date: Wed, 13 May 2015 10:16:14 +0000 (+0100)
Subject: Fix missing audio mapping digest in FFmpegContent audio analysis paths.
X-Git-Tag: v2.0.48~89^2~23
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=55bbed60ce090b8f84194b546e2c8d4ebed2eb2f;ds=sidebyside

Fix missing audio mapping digest in FFmpegContent audio analysis paths.
---

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index ad9096b92..496dac8d8 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -365,12 +365,10 @@ FFmpegContent::audio_analysis_path () const
 	   analyses for each stream.
 	*/
 
-	boost::filesystem::path p = film->audio_analysis_dir ();
-	string name = digest();
+	boost::filesystem::path p = AudioContent::audio_analysis_path ();
 	if (audio_stream ()) {
-		name += "_" + audio_stream()->identifier ();
+		p += "_" + audio_stream()->identifier ();
 	}
-	p /= name;
 	return p;
 }