Make terminate_threads() less likely to leave _threads containing invalid pointers.

[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 35f76be7c4d1894346a4426363a1aba4f416060c..b3f7f431e025fe14940159b0dced2c6fbbde3e2c 100644 (file)
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -91,6 +91,20 @@ StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const
 DCPTime
 StringTextFileContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(film), 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;
+}