More enum class additions.

[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..01e0fe60ff490450b3e30a950f640020f4ce22dd 100644 (file)
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -32,26 +32,29 @@
 
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+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 (shared_ptr<TextContent> (new TextContent (this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN)));
 }
 
-StringTextFileContent::StringTextFileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-       : Content (film, node)
+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);
+       Content::examine (film, job);
        StringTextFile s (shared_from_this ());
 
        /* Default to turning these subtitles on */
@@ -59,7 +62,7 @@ StringTextFileContent::examine (boost::shared_ptr<Job> job)
 
        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
@@ -88,8 +91,22 @@ StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const
 }
 
 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
+{
+       string s = Content::identifier ();
+       s += "_" + only_text()->identifier();
+       return s;
+}