summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-08 14:34:03 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-08 14:34:03 +0100
commit5ea436422329f6526d5fb04ada95fe9f46a26558 (patch)
tree70149d735698092b51f51632c239398122d0beea /src/lib
parentf07623551706b849190c84059bac455088f8eb1e (diff)
Default to enabling DCP/SubRip subtitles after they have been added.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/dcp_subtitle_content.cc3
-rw-r--r--src/lib/subrip_content.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index c457e8474..742773043 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -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);
diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index f9d184b9d..8becbc4d0 100644
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -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)));