Default to enabling DCP/SubRip subtitles after they have been added.
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 13:34:03 +0000 (14:34 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 13:34:03 +0000 (14:34 +0100)
src/lib/dcp_subtitle_content.cc
src/lib/subrip_content.cc

index c457e84740ddbfab828876875f47349f51922093..742773043a8fc931b319e9af9a8110736dfe767b 100644 (file)
@@ -53,6 +53,9 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
        Content::examine (job);
 
        shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+
+       /* Default to turning these subtitles on */
+       set_use_subtitles (true);
        
        boost::mutex::scoped_lock lm (_mutex);
 
index f9d184b9d965f6c6a725ec523c44da813946105b..8becbc4d03b6905d53493c6139ba83823a006462 100644 (file)
@@ -59,6 +59,9 @@ SubRipContent::examine (boost::shared_ptr<Job> job)
        
        DCPTime len (s.length (), film->active_frame_rate_change (position ()));
 
+       /* Default to turning these subtitles on */
+       set_use_subtitles (true);
+
        boost::mutex::scoped_lock lm (_mutex);
        _length = len;
        _fonts.push_back (shared_ptr<Font> (new Font (font_id)));