Set up OV/VF in name according to whether DCP content has been referenced.

[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 3f9772d597de3b6464fe6b888a3f0be821d503d6..8e24cb4c660d43f28ed2e07e1fa68df43eecc512 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -20,9 +20,10 @@
 #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_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
@@ -30,12 +31,13 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+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)
@@ -51,15 +53,26 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
        Content::examine (job);
 
-       shared_ptr<dcp::SubtitleContent> sc = load (path (0));
-       
+       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 ());
+
+       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 ()) {
-               _fonts.push_back (shared_ptr<Font> (new Font (i->id)));
+               add_font (shared_ptr<Font> (new Font (i->id)));
        }
 }
 
@@ -83,7 +96,7 @@ DCPSubtitleContent::technical_summary () const
 {
        return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
+
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {