Fix subtitle controls in the viewer.

[dcpomatic.git] / src / lib / video_decoder.cc

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index d1a8fc6e66c172edcb3e82168392517cb0a76ca6..54d14e2c68ab2562b6d6e8945fd1723661047065 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -56,25 +56,27 @@ VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
        
-       libdcp::Size const container_size = film->container()->size (film->full_frame ());
+       libdcp::Size const container_size = _video_container_size.get_value_or (film->container()->size (film->full_frame ()));
        libdcp::Size const image_size = _video_content->ratio()->size (container_size);
        
        shared_ptr<Image> out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true);
 
-       shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-               sub = _timed_subtitle->subtitle ();
-       }
-
-       if (sub) {
-               dcpomatic::Rect const tx = subtitle_transformed_area (
-                       float (image_size.width) / video_size().width,
-                       float (image_size.height) / video_size().height,
-                       sub->area(), film->subtitle_offset(), film->subtitle_scale()
-                       );
-
-               shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
-               out->alpha_blend (im, tx.position());
+       if (film->with_subtitles ()) {
+               shared_ptr<Subtitle> sub;
+               if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
+                       sub = _timed_subtitle->subtitle ();
+               }
+               
+               if (sub) {
+                       dcpomatic::Rect const tx = subtitle_transformed_area (
+                               float (image_size.width) / video_size().width,
+                               float (image_size.height) / video_size().height,
+                               sub->area(), film->subtitle_offset(), film->subtitle_scale()
+                               );
+                       
+                       shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
+                       out->alpha_blend (im, tx.position());
+               }
        }
 
        if (image_size != container_size) {
@@ -144,4 +146,8 @@ VideoDecoder::seek_forward ()
        _next_video += film->video_frames_to_time (1);
 }
 
-       
+void
+VideoDecoder::set_video_container_size (libdcp::Size s)
+{
+       _video_container_size = s;
+}