X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=fc0637bfd89d523140c60ea7ca58f8b0bee9d150;hb=59e769023c392c332331567a1aea94660002c463;hp=14cb50b86718eb3a25e0a3516a5cea9f823261e1;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091;p=dcpomatic.git diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index 14cb50b86..fc0637bfd 100644 --- a/src/lib/subrip_content.cc +++ b/src/lib/subrip_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington 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,6 +21,7 @@ #include "util.h" #include "subrip.h" #include "film.h" +#include "font.h" #include #include "i18n.h" @@ -31,6 +32,8 @@ using dcp::raw_convert; using boost::shared_ptr; using boost::lexical_cast; +std::string const SubRipContent::font_id = "font"; + SubRipContent::SubRipContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) , SubtitleContent (film, path) @@ -53,12 +56,13 @@ SubRipContent::examine (boost::shared_ptr job) SubRip s (shared_from_this ()); shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); DCPTime len (s.length (), film->active_frame_rate_change (position ())); boost::mutex::scoped_lock lm (_mutex); _length = len; + _fonts.push_back (shared_ptr (new Font (font_id))); } string @@ -73,12 +77,6 @@ SubRipContent::technical_summary () const return Content::technical_summary() + " - " + _("SubRip subtitles"); } -string -SubRipContent::information () const -{ - -} - void SubRipContent::as_xml (xmlpp::Node* node) const {