Rename ContentText and subclasses to PieceText... and pass subtitles through Piece.

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

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 673271b2eae3b144a0e0d2f36c19d034f24dc763..353bb03da775a92ae7bbd11e6aa03e8adc1e0afc 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -62,7 +62,7 @@ TextDecoder::TextDecoder (
 void
 TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-       BitmapStart (ContentBitmapText (from, image, rect));
+       BitmapStart (from, image, rect);
        _position = from;
 }
 
@@ -97,7 +97,7 @@ TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> s)
                }
        }
 
-       PlainStart (ContentStringText (from, s));
+       StringStart (from, s);
        _position = from;
 }