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/player.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/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 54fa074c0..b0ffe0e04 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -116,7 +116,7 @@ private: void film_changed (Film::Property); void playlist_changed (); void playlist_content_changed (boost::weak_ptr<Content>, int, bool); - std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const; + std::list<PositionImage> transform_bitmap_texts (std::list<BitmapText>) const; Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const; DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const; Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; @@ -126,8 +126,8 @@ private: boost::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const; void video (boost::weak_ptr<Piece>, ContentVideo); void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); - void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle); - void text_subtitle_start (boost::weak_ptr<Piece>, ContentTextSubtitle); + void bitmap_text_start (boost::weak_ptr<Piece>, ContentBitmapText); + void plain_text_start (boost::weak_ptr<Piece>, ContentTextSubtitle); void subtitle_stop (boost::weak_ptr<Piece>, ContentTime); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); |