diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
| commit | b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 (patch) | |
| tree | 0c5ccae6f26d46c270e9287a722b63e397900c57 /src/lib/video_decoder.cc | |
| parent | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (diff) | |
Give Film a container; move crop into video content; other bits.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 533fdcf1a..0c8cda294 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -32,8 +32,9 @@ using std::cout; using boost::shared_ptr; using boost::optional; -VideoDecoder::VideoDecoder (shared_ptr<const Film> f) +VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c) : Decoder (f) + , _video_content (c) , _video_frame (0) , _last_content_time (0) { @@ -72,7 +73,7 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s) if (_timed_subtitle) { Position const p = _timed_subtitle->subtitle()->position (); - _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top)); + _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top)); } } |