From b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 May 2013 23:19:31 +0100 Subject: Give Film a container; move crop into video content; other bits. --- src/lib/video_decoder.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/video_decoder.cc') 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 f) +VideoDecoder::VideoDecoder (shared_ptr f, shared_ptr c) : Decoder (f) + , _video_content (c) , _video_frame (0) , _last_content_time (0) { @@ -72,7 +73,7 @@ VideoDecoder::emit_subtitle (shared_ptr 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)); } } -- cgit v1.2.3