Tidy up careful_string_filter and add some extra transliterations.

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

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 8111154e348f00b619e0f81229f3d9e7b04993a2..d5afb555d6683e84daa13c4fe36cfd53151e3b14 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -36,7 +36,6 @@ using std::min;
 using std::max;
 using std::shared_ptr;
 using boost::optional;
-using std::function;
 using namespace dcpomatic;
 
 
@@ -61,10 +60,10 @@ TextDecoder::TextDecoder (
  *  of the video frame)
  */
 void
-TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<const Image> image, dcpomatic::Rect<double> rect)
+TextDecoder::emit_bitmap_start (ContentBitmapText const& bitmap)
 {
-       BitmapStart (ContentBitmapText (from, image, rect));
-       _position = from;
+       BitmapStart (bitmap);
+       _position = bitmap.from();
 }
 
 
@@ -248,7 +247,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
                                           use libsub for DCP subs) we can cheat by just putting 0 in here.
                                        */
                                        dcp::Time (),
-                                       dcp::Time ()
+                                       dcp::Time (),
+                                       0
                                        )
                                );
                }
@@ -288,7 +288,7 @@ TextDecoder::emit_plain (ContentTimePeriod period, sub::Subtitle const & s)
 void
 TextDecoder::emit_bitmap (ContentTimePeriod period, shared_ptr<const Image> image, dcpomatic::Rect<double> rect)
 {
-       emit_bitmap_start (period.from, image, rect);
+       emit_bitmap_start ({ period.from, image, rect });
        emit_stop (period.to);
 }