11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions...

[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 45c4be9b21bad8e8148154ad4491f0d345e3d4f6..3f9772d597de3b6464fe6b888a3f0be821d503d6 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -19,17 +19,17 @@
 
 #include "font.h"
 #include "dcp_subtitle_content.h"
+#include "raw_convert.h"
 #include <dcp/interop_subtitle_content.h>
 #include <dcp/smpte_subtitle_content.h>
-#include <dcp/interop_load_font.h>
-#include <dcp/raw_convert.h>
+#include <dcp/interop_load_font_node.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
@@ -47,9 +47,9 @@ 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);
+       Content::examine (job);
 
        shared_ptr<dcp::SubtitleContent> sc = load (path (0));
        
@@ -58,9 +58,8 @@ DCPSubtitleContent::examine (shared_ptr<Job> job, bool calculate_digest)
        _subtitle_language = sc->language ();
        _length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ());
 
-       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)));
+       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+               _fonts.push_back (shared_ptr<Font> (new Font (i->id)));
        }
 }