Fix failure on 1-frame-back seek (#604).

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 969829b31e1a9075d2e7316fb1cfab2ecbaed58e..9656ec184144261c8a830de31b188bf698aac814 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,16 +22,17 @@
 #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;
 
+std::string const SubRipContent::font_id = "font";
+
 SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
        , SubtitleContent (film, path)
@@ -48,19 +49,22 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 }
 
 void
-SubRipContent::examine (boost::shared_ptr<Job> job, bool calculate_digest)
+SubRipContent::examine (boost::shared_ptr<Job> job)
 {
-       Content::examine (job, calculate_digest);
+       Content::examine (job);
        SubRip s (shared_from_this ());
 
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       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 ()));
+       add_font (shared_ptr<Font> (new Font (font_id)));
 }
 
 string
@@ -75,12 +79,6 @@ SubRipContent::technical_summary () const
        return Content::technical_summary() + " - " + _("SubRip subtitles");
 }
 
-string
-SubRipContent::information () const
-{
-
-}
-       
 void
 SubRipContent::as_xml (xmlpp::Node* node) const
 {