diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-08 14:23:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-08 14:23:08 +0100 |
| commit | 02de0e70ffa175861fb4392e9df4e5a7c1579375 (patch) | |
| tree | 3207125240d7155d8e55e3339f1f2b2c363a1dfc /src/lib | |
| parent | 73f52e94953848c696725defd3d7f5c4c30707e2 (diff) | |
Small clean up to video examiner use.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 5 | ||||
| -rw-r--r-- | src/lib/image_content.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index a1992102c..da4acb5f8 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -172,8 +172,6 @@ FFmpegContent::examine (shared_ptr<Job> job) shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ())); take_from_video_examiner (examiner); - ContentTime video_length = examiner->video_length (); - shared_ptr<const Film> film = _film.lock (); assert (film); LOG_GENERAL ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())); @@ -181,8 +179,6 @@ FFmpegContent::examine (shared_ptr<Job> job) { boost::mutex::scoped_lock lm (_mutex); - _video_length = video_length; - _subtitle_streams = examiner->subtitle_streams (); if (!_subtitle_streams.empty ()) { _subtitle_stream = _subtitle_streams.front (); @@ -196,7 +192,6 @@ FFmpegContent::examine (shared_ptr<Job> job) _first_video = examiner->first_video (); } - signal_changed (ContentProperty::LENGTH); signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS); signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); signal_changed (FFmpegContentProperty::AUDIO_STREAMS); diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index acaedf050..70d777bca 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -109,9 +109,7 @@ ImageContent::examine (shared_ptr<Job> job) assert (film); shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job)); - take_from_video_examiner (examiner); - set_video_length (examiner->video_length ()); } void diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 97e7915df..5fd71076b 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -188,15 +188,18 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d) /* These examiner calls could call other content methods which take a lock on the mutex */ dcp::Size const vs = d->video_size (); float const vfr = d->video_frame_rate (); + ContentTime vl = d->video_length (); { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; _video_frame_rate = vfr; + _video_length = vl; } signal_changed (VideoContentProperty::VIDEO_SIZE); signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + signal_changed (ContentProperty::LENGTH); } |