dcpomatic/src/lib/player_text.h, branch mainDCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=main2023-08-29T16:28:40ZCleanup: use some more vector instead of list.2023-08-29T16:28:40ZCarl Hetheringtoncth@carlh.net2023-08-26T12:29:06Zurn:sha1:c7f45cd00b94393f6e15428a2ea256995f890412Rearrange 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.
Rearrange some includes of dcpomatic_time.h2022-06-07T15:01:06ZCarl Hetheringtoncth@carlh.net2022-06-01T09:05:53Zurn:sha1:3ee25c2fabd43040f9388efa89482b90cb4ccadcAssorted C++11/formatting cleanups.2021-04-08T19:32:44ZCarl Hetheringtoncth@carlh.net2021-04-08T19:32:44Zurn:sha1:3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4Assorted C++11/formatting cleanups.2021-04-07T20:15:01ZCarl Hetheringtoncth@carlh.net2021-04-07T20:15:01Zurn:sha1:7bc2134d658778e04f1756c255e604b4ab5a5831std::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:f41818f14369f170475b7f2bde1a2dd856517b14Some subtitle renaming.2018-08-03T23:22:51ZCarl Hetheringtoncth@carlh.net2018-08-03T23:22:51Zurn:sha1:0a5e92450ae992e9ed24026dd60ae351d0a3e60bMore 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