No-op: remove all trailing whitespace.

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index fc0637bfd89d523140c60ea7ca58f8b0bee9d150..7ab13c2c3cf8f80a7f87542443d266cc7203910d 100644 (file)
--- 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 <dcp/raw_convert.h>
+#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> job)
 
        shared_ptr<const Film> 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<Font> (new Font (font_id)));
+       add_font (shared_ptr<Font> (new Font (font_id)));
 }
 
 string