C++11 tidying.

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

diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc
index 2698dbb6d733fad73da91e07cf1d4cbfed301cb0..69d2a67560e35a4f774a39f689ec01e96c8458a1 100644 (file)
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "string_text_file_content.h"
 #include "util.h"
 #include "string_text_file.h"
@@ -28,68 +29,97 @@
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
+
 
-StringTextFileContent::StringTextFileContent (shared_ptr<const Film> film, boost::filesystem::path path)
-       : Content (film, path)
+StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
+       : Content (path)
 {
-       text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE)));
+       text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN));
 }
 
-StringTextFileContent::StringTextFileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-       : Content (film, node)
-       , _length (node->number_child<ContentTime::Type> ("Length"))
+
+StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version)
+       : Content (node)
+       , _length (node->number_child<ContentTime::Type>("Length"))
 {
        text = TextContent::from_xml (this, node, version);
 }
 
+
 void
-StringTextFileContent::examine (boost::shared_ptr<Job> job)
+StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
-       Content::examine (job);
-       StringTextFile s (shared_from_this ());
+       Content::examine (film, job);
+       StringTextFile s (shared_from_this());
 
        /* Default to turning these subtitles on */
        only_text()->set_use (true);
 
        boost::mutex::scoped_lock lm (_mutex);
        _length = s.length ();
-       only_text()->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
+       only_text()->add_font (make_shared<Font>(TEXT_FONT_ID));
 }
 
+
 string
 StringTextFileContent::summary () const
 {
        return path_summary() + " " + _("[subtitles]");
 }
 
+
 string
 StringTextFileContent::technical_summary () const
 {
        return Content::technical_summary() + " - " + _("Text subtitles");
+
 }
 
+
 void
 StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
-       node->add_child("Type")->add_child_text ("TextSubtitle");
+       node->add_child("Type")->add_child_text("TextSubtitle");
        Content::as_xml (node, with_paths);
 
        if (only_text()) {
-               only_text()->as_xml (node);
+               only_text()->as_xml(node);
        }
 
-       node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
+       node->add_child("Length")->add_child_text(raw_convert<string>(_length.get ()));
 }
 
+
 DCPTime
-StringTextFileContent::full_length () const
+StringTextFileContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate ());
+       FrameRateChange const frc (film, shared_from_this());
        return DCPTime (_length, frc);
 }
+
+
+DCPTime
+StringTextFileContent::approximate_length () const
+{
+       return DCPTime (_length, FrameRateChange());
+}
+
+
+string
+StringTextFileContent::identifier () const
+{
+       auto s = Content::identifier ();
+       s += "_" + only_text()->identifier();
+       return s;
+}