Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...

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

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 351d8c26ef8e07b958b2c2323f7a2893ede12b99..9f2ff61c5aea829be5d5331f2dd9b4126e9493a9 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_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
@@ -20,6 +20,7 @@
 #include "font.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_content.h>
+#include <dcp/smpte_subtitle_content.h>
 #include <dcp/interop_load_font.h>
 #include <dcp/raw_convert.h>
 
@@ -46,19 +47,19 @@ DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::Const
 }
 
 void
-DCPSubtitleContent::examine (shared_ptr<Job> job, bool calculate_digest)
+DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
-       Content::examine (job, calculate_digest);
-       
-       dcp::InteropSubtitleContent sc (path (0));
+       Content::examine (job);
 
+       shared_ptr<dcp::SubtitleContent> sc = load (path (0));
+       
        boost::mutex::scoped_lock lm (_mutex);
        
-       _subtitle_language = sc.language ();
-       _length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
+       _subtitle_language = sc->language ();
+       _length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ());
 
-       list<shared_ptr<dcp::InteropLoadFont> > fonts = sc.load_font_nodes ();
-       for (list<shared_ptr<dcp::InteropLoadFont> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+       list<shared_ptr<dcp::LoadFont> > fonts = sc->load_font_nodes ();
+       for (list<shared_ptr<dcp::LoadFont> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
                _fonts.push_back (shared_ptr<Font> (new Font ((*i)->id)));
        }
 }
@@ -84,12 +85,6 @@ DCPSubtitleContent::technical_summary () const
        return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
       
-string
-DCPSubtitleContent::information () const
-{
-
-}
-
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {