dcpomatic/src/lib/render_text.h, branch v2.16.26DCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=v2.16.262022-06-07T15:01:06ZRearrange subtitle font management.2022-06-07T15:01:06ZCarl Hetheringtoncth@carlh.net2022-06-01T11:03:38Zurn:sha1:5a820bb8fae34591be5ac6d19a73461b9dab532a
With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent. This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.
Basic and slightly inaccurate support for <Space> in subtitles (#2103).2021-10-17T13:35:14ZCarl Hetheringtoncth@carlh.net2021-10-15T20:25:42Zurn:sha1:ccd69987ab861ea4521836fa2a5227e2dfac3479
Adding horizontal space to a Pango layout is hard, and I think this
change probably gets it slightly wrong, but it's a step in the right
direction.
std::shared_ptr2021-01-07T21:48:29ZCarl Hetheringtoncth@carlh.net2021-01-04T20:16:53Zurn:sha1:dd9be86db6cde0afa5da0d1d1ac43b42e05dca26Put Font and Screen into dcpomatic namespace.2019-05-10T22:43:55ZCarl Hetheringtoncth@carlh.net2019-05-08T22:56:32Zurn:sha1:f41818f14369f170475b7f2bde1a2dd856517b14Put Time types in dcpomatic namespace.2019-05-10T22:43:55ZCarl Hetheringtoncth@carlh.net2019-05-08T22:41:42Zurn:sha1:c4403784febdbdd42e9c32e67fadb147f11fe566More automated renaming.2018-07-23T10:20:12ZCarl Hetheringtoncth@carlh.net2018-07-23T10:20:12Zurn:sha1:df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Reword again: Text -> Caption and Plain -> Text.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T20:48:27Zurn:sha1:9cb73fbc0fa4643612f01665bc6d9fc430656f32
sed -i "s/ActiveText/ActiveCaptions/g" src/lib/*.{cc,h}
sed -i "s/active_text.h/active_captions.h/g" src/lib/*.{cc,h}
sed -i "s/active_text.cc/active_captions.cc/g" src/lib/wscript
mv src/lib/active_text.cc src/lib/active_captions.cc
mv src/lib/active_text.h src/lib/active_captions.h
sed -i "s/PlainTextFileContent/TextCaptionFileContent/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/PlainTextFile/TextCaptionFile/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/plain_text_file_content/text_caption_file_content/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} test/*.cc
mv src/lib/plain_text_file_content.cc src/lib/text_caption_file_content.cc
mv src/lib/plain_text_file_content.h src/lib/text_caption_file_content.h
sed -i "s/PlainTextFileDecoder/TextCaptionFileDecoder/g" src/lib/*.{cc,h}
sed -i "s/plain_text_file_decoder/text_caption_file_decoder/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h}
mv src/lib/plain_text_file_decoder.cc src/lib/text_caption_file_decoder.cc
mv src/lib/plain_text_file_decoder.h src/lib/text_caption_file_decoder.h
sed -i "s/PlayerText/PlayerCaption/g" src/lib/*.{cc,h}
sed -i "s/player_text.cc/player_caption.cc/g" src/lib/wscript
sed -i "s/player_text.h/player_caption.h/g" src/lib/*.{cc,h}
mv src/lib/player_text.cc src/lib/player_caption.cc
mv src/lib/player_text.h src/lib/player_caption.h
sed -i "s/ContentPlainText/ContentTextCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/ContentBitmapText/ContentBitmapCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/PlainText/TextCaption/g" src/lib/*.{cc,h} test/*.cc
sed -i "s/plain_text.h/text_caption.h/g" src/lib/*.{cc,h}
mv src/lib/plain_text.h src/lib/text_caption.h
Finish PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T19:10:45Zurn:sha1:0e4a58abdc78f84478031acdc0acb95f5cb9a2a6Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T18:58:30Zurn:sha1:ae95d9cab28e414245e15ddeae20e96735594a8bMore renaming.2018-07-19T22:36:56ZCarl Hetheringtoncth@carlh.net2018-07-18T23:42:56Zurn:sha1:d3c009991a782fa51e85828c7600994a9dd91559
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