X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=7ab13c2c3cf8f80a7f87542443d266cc7203910d;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=fc0637bfd89d523140c60ea7ca58f8b0bee9d150;hpb=59e769023c392c332331567a1aea94660002c463;p=dcpomatic.git diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index fc0637bfd..7ab13c2c3 100644 --- a/src/lib/subrip_content.cc +++ b/src/lib/subrip_content.cc @@ -22,13 +22,12 @@ #include "subrip.h" #include "film.h" #include "font.h" -#include +#include "raw_convert.h" #include "i18n.h" using std::string; using std::cout; -using dcp::raw_convert; using boost::shared_ptr; using boost::lexical_cast; @@ -57,12 +56,15 @@ SubRipContent::examine (boost::shared_ptr job) shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - + 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 (new Font (font_id))); + add_font (shared_ptr (new Font (font_id))); } string