diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 00:42:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | d3c009991a782fa51e85828c7600994a9dd91559 (patch) | |
| tree | 8519a3138c11aeb96c8e6c7e8a749c23b7aaf468 /src/lib/text_decoder.h | |
| parent | af2bea29ef9975dadd26297876e2408e5e874a0c (diff) | |
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
Diffstat (limited to 'src/lib/text_decoder.h')
| -rw-r--r-- | src/lib/text_decoder.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index d9d351d92..221ed6d37 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -49,11 +49,11 @@ public: return _position; } - void emit_image_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); - void emit_text_start (ContentTime from, std::list<dcp::SubtitleString> s); - void emit_text_start (ContentTime from, sub::Subtitle const & subtitle); - void emit_text (ContentTimePeriod period, std::list<dcp::SubtitleString> s); - void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle); + void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect); + void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s); + void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle); + void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s); + void emit_plain (ContentTimePeriod period, sub::Subtitle const & subtitle); void emit_stop (ContentTime to); void seek (); @@ -62,8 +62,8 @@ public: return _content; } - boost::signals2::signal<void (ContentImageSubtitle)> ImageStart; - boost::signals2::signal<void (ContentTextSubtitle)> TextStart; + boost::signals2::signal<void (ContentBitmapText)> BitmapStart; + boost::signals2::signal<void (ContentTextSubtitle)> PlainStart; boost::signals2::signal<void (ContentTime)> Stop; private: |