X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=7ab13c2c3cf8f80a7f87542443d266cc7203910d;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=c60b05d50a1ede29617d30ae2c8733593546b190;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a;p=dcpomatic.git

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index c60b05d50..7ab13c2c3 100644
--- 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
@@ -21,17 +21,18 @@
 #include "util.h"
 #include "subrip.h"
 #include "film.h"
-#include <dcp/raw_convert.h>
+#include "font.h"
+#include "raw_convert.h"
 
 #include "i18n.h"
 
-using std::stringstream;
 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)
@@ -54,12 +55,16 @@ SubRipContent::examine (boost::shared_ptr<Job> 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;
+	add_font (shared_ptr<Font> (new Font (font_id)));
 }
 
 string
@@ -74,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
 {