X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=6da5afa0c986a22bd45a52f90f434d9fab0df4bf;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=83a43f3bd2eae6ee48a54594adf313403dca8df2;hpb=e194f0003b60b2607da0822485c56cd8267e78dc;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 83a43f3bd..6da5afa0c 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -141,35 +141,19 @@ AudioContent::audio_analysis_path () const
 		return boost::filesystem::path ();
 	}
 
-	return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
+	boost::filesystem::path p = film->audio_analysis_dir ();
+	p /= digest ();
+	return p;
 }
 
 string
 AudioContent::technical_summary () const
 {
-	return String::compose ("audio: channels %1, length %2, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate());
-}
-
-/** Note: this is not particularly fast, as the FrameRateChange lookup
- *  is not very intelligent.
- *
- *  @param t Some duration to convert.
- *  @param at The time within the DCP to get the active frame rate change from; i.e. a point at which
- *  the `controlling' video content is active.
- */
-AudioContent::Frame
-AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	/* Consider the case where we're running a 25fps video at 24fps (i.e. slow)
-	   Our audio is at 44.1kHz.  We will resample it to 48000 * 25 / 24 and then
-	   run it at 48kHz (i.e. slow, to match).
-
-	   After 1 second, we'll have run the equivalent of 44.1kHz * 24 / 25 samples
-	   in the source.
-	*/
-	
-	return rint (t * content_audio_frame_rate() * film->active_frame_rate_change(at).speed_up / TIME_HZ);
+	return String::compose (
+		"audio: channels %1, length %2, raw rate %3, out rate %4",
+		audio_channels(),
+		audio_length().seconds(),
+		content_audio_frame_rate(),
+		output_audio_frame_rate()
+		);
 }