Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[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 e7057efc4b59528585e77965d88233d52275cf7b..a8e98d4264b3d82f12293b9f22c6eccbeebe4ceb 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,9 +20,9 @@
 
 #include "font.h"
 #include "dcp_subtitle_content.h"
-#include "raw_convert.h"
 #include "film.h"
-#include "subtitle_content.h"
+#include "text_content.h"
+#include <dcp/raw_convert.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
@@ -35,18 +35,19 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 {
-       subtitle.reset (new SubtitleContent (this));
+       text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_OPEN_SUBTITLE)));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
        , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-       subtitle = SubtitleContent::from_xml (this, node, version);
+       text = TextContent::from_xml (this, node, version);
 }
 
 void
@@ -65,18 +66,18 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
        boost::mutex::scoped_lock lm (_mutex);
 
        /* Default to turning these subtitles on */
-       subtitle->set_use (true);
+       only_text()->set_use (true);
 
        if (iop) {
-               subtitle->set_language (iop->language ());
+               only_text()->set_language (iop->language ());
        } else if (smpte) {
-               subtitle->set_language (smpte->language().get_value_or (""));
+               only_text()->set_language (smpte->language().get_value_or (""));
        }
 
        _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
 
        BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-               subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
+               only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
        }
 }
 
@@ -100,13 +101,13 @@ DCPSubtitleContent::technical_summary () const
 }
 
 void
-DCPSubtitleContent::as_xml (xmlpp::Node* node) const
+DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        node->add_child("Type")->add_child_text ("DCPSubtitle");
-       Content::as_xml (node);
+       Content::as_xml (node, with_paths);
 
-       if (subtitle) {
-               subtitle->as_xml (node);
+       if (only_text()) {
+               only_text()->as_xml (node);
        }
 
        node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));