summaryrefslogtreecommitdiff
path: root/src/lib/audio_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-06 01:29:06 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-06 01:29:06 +0000
commit188877db5362b9b630588b2dfee4002d71a29372 (patch)
tree69e734955b92f9fb7b72b43209f3423b2966354e /src/lib/audio_content.cc
parent9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (diff)
Clean up a bit by using Content::film() more.
Diffstat (limited to 'src/lib/audio_content.cc')
-rw-r--r--src/lib/audio_content.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index c67a66ed8..838fdcae2 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -191,13 +191,10 @@ AudioContent::audio_mapping () const
int
AudioContent::resampled_audio_frame_rate () const
{
- shared_ptr<const Film> film = _film.lock ();
- DCPOMATIC_ASSERT (film);
-
/* Resample to a DCI-approved sample rate */
double t = has_rate_above_48k() ? 96000 : 48000;
- FrameRateChange frc = film->active_frame_rate_change (position ());
+ FrameRateChange frc = film()->active_frame_rate_change (position ());
/* Compensate if the DCP is being run at a different frame rate
to the source; that is, if the video is run such that it will