No-op: remove all trailing whitespace.

[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 e814946f4ca1e58d6ee7fcd4791ae25713838782..8b09b6fee1628671403895879868f1fe150c582f 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
@@ -19,22 +19,24 @@
 
 #include "font.h"
 #include "dcp_subtitle_content.h"
-#include <dcp/interop_subtitle_content.h>
-#include <dcp/interop_load_font.h>
-#include <dcp/raw_convert.h>
+#include "raw_convert.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.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;
+using boost::dynamic_pointer_cast;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
        , SubtitleContent (film, path)
 {
-       
+
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
@@ -46,20 +48,30 @@ 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::SubtitleAsset> sc = load (path (0));
+
+       /* Default to turning these subtitles on */
+       set_use_subtitles (true);
 
        boost::mutex::scoped_lock lm (_mutex);
-       
-       _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) {
-               _fonts.push_back (shared_ptr<Font> (new Font ((*i)->id)));
+       shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
+       if (iop) {
+               _subtitle_language = iop->language ();
+       }
+       shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+       if (smpte) {
+               _subtitle_language = smpte->language().get_value_or ("");
+       }
+
+       _length = DCPTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+
+       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+               add_font (shared_ptr<Font> (new Font (i->id)));
        }
 }
 
@@ -83,7 +95,7 @@ DCPSubtitleContent::technical_summary () const
 {
        return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
+
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {