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 892578adecc11595bf8059ee2530f87bf88dca14..7ab13c2c3cf8f80a7f87542443d266cc7203910d 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
@@ -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)
@@ -42,7 +43,7 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
 SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
        , SubtitleContent (film, node, version)
-       , _length (node->number_child<int64_t> ("Length"))
+       , _length (node->number_child<DCPTime::Type> ("Length"))
 {
 
 }
@@ -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
 {
@@ -97,15 +96,3 @@ SubRipContent::full_length () const
        */
        return _length;
 }
-
-string
-SubRipContent::identifier () const
-{
-       stringstream s;
-       s << Content::identifier()
-         << "_" << raw_convert<string> (subtitle_scale())
-         << "_" << raw_convert<string> (subtitle_x_offset())
-         << "_" << raw_convert<string> (subtitle_y_offset());
-
-       return s.str ();
-}