From d3c009991a782fa51e85828c7600994a9dd91559 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Jul 2018 00:42:56 +0100 Subject: More renaming. sed -i "s/emit_text/emit_plain/g" src/lib/*.cc src/lib/*.h sed -i "s/emit_image_start/emit_bitmap_start/g" src/lib/*.cc src/lib/*.h sed -i "s/emit_text_start/emit_plain_start/g" src/lib/*.cc src/lib/*.h sed -i "s/render_subtitles/render_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript test/*.cc sed -i "s/ImageStart/BitmapStart/g" src/lib/*.cc src/lib/*.h sed -i "s/TextStart/PlainStart/g" src/lib/*.cc src/lib/*.h test/*.cc src/wx/*.cc sed -i "s/ImageSubtitle/BitmapText/g" src/lib/*.cc src/lib/*.h sed -i "s/text_subtitle/plain_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript src/wx/*.cc src/wx/*.h test/*.cc sed -i "s/image_subtitle/bitmap_text/g" src/lib/*.cc src/lib/*.h mv src/lib/render_subtitles.cc src/lib/render_text.cc mv src/lib/render_subtitles.h src/lib/render_text.h mv src/lib/text_subtitle.cc src/lib/plain_text.cc mv src/lib/text_subtitle.h src/lib/plain_text.h --- src/lib/dcp_text_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/dcp_text_decoder.cc') diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc index 576cfd357..168bfa5cc 100644 --- a/src/lib/dcp_text_decoder.cc +++ b/src/lib/dcp_text_decoder.cc @@ -63,7 +63,7 @@ DCPTextDecoder::pass () /* Gather all subtitles with the same time period that are next on the list. We must emit all subtitles for the same time - period with the same text_subtitle() call otherwise the + period with the same plain_text() call otherwise the TextDecoder will assume there is nothing else at the time of emit the first. */ @@ -81,7 +81,7 @@ DCPTextDecoder::pass () /* XXX: image subtitles */ } - subtitle->emit_text (p, s); + subtitle->emit_plain (p, s); return false; } -- cgit v1.2.3