diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:29:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:29:06 +0000 |
| commit | 188877db5362b9b630588b2dfee4002d71a29372 (patch) | |
| tree | 69e734955b92f9fb7b72b43209f3423b2966354e /src/lib/ffmpeg_content.cc | |
| parent | 9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (diff) | |
Clean up a bit by using Content::film() more.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 6df97a485..a317ec35f 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -187,9 +187,6 @@ FFmpegContent::examine (shared_ptr<Job> job) shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job)); take_from_video_examiner (examiner); - shared_ptr<const Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - { boost::mutex::scoped_lock lm (_mutex); @@ -202,7 +199,7 @@ FFmpegContent::examine (shared_ptr<Job> job) if (!_audio_streams.empty ()) { AudioMapping m = _audio_streams.front()->mapping (); - film->make_audio_mapping_default (m); + film()->make_audio_mapping_default (m); _audio_streams.front()->set_mapping (m); } @@ -280,10 +277,8 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b) DCPTime FFmpegContent::full_length () const { - shared_ptr<const Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ()); - return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate()); + FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ()); + return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); } void |