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

[dcpomatic.git] / src / lib / content_text.h

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index eaba64ecfcb97d8a6f1ba3171aa192bb7bd4b2b1..2d8910577926c38bd259b1e10a7a7c82c90f356d 100644 (file)
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -33,29 +33,23 @@ class Image;
 class ContentText
 {
 public:
-       explicit ContentText (ContentTime f, TextType t)
+       explicit ContentText (ContentTime f)
                : _from (f)
-               , _type (t)
        {}
 
        ContentTime from () const {
                return _from;
        }
 
-       TextType type () const {
-               return _type;
-       }
-
 private:
        ContentTime _from;
-       TextType _type;
 };
 
 class ContentBitmapText : public ContentText
 {
 public:
-       ContentBitmapText (ContentTime f, TextType type, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : ContentText (f, type)
+       ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+               : ContentText (f)
                , sub (im, r)
        {}
 
@@ -67,11 +61,11 @@ public:
  *  as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems
  *  when we want to compare the quantised periods to the unquantised ones.
  */
-class ContentPlainText : public ContentText
+class ContentStringText : public ContentText
 {
 public:
-       ContentPlainText (ContentTime f, TextType type, std::list<dcp::SubtitleString> s)
-               : ContentText (f, type)
+       ContentStringText (ContentTime f, std::list<dcp::SubtitleString> s)
+               : ContentText (f)
                , subs (s)
        {}