dcpomatic/src/lib/content_text.h, branch nvidiaDCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=nvidia2022-04-28T12:00:07ZHandle multiple bitmap subtitles at the same time correctly (#2239).2022-04-28T12:00:07ZCarl Hetheringtoncth@carlh.net2022-04-28T12:00:07Zurn:sha1:e06941199da90359f41ce80c276752bc0f172d7e
Previously if there were two images at the same time we would start
them both, then the stop time would be set in the second one but
not the first. This meant that the first one would hang around
forever.
Allow ContentBitmapText to contain multiple BitmapText objects.2022-04-28T11:47:57ZCarl Hetheringtoncth@carlh.net2022-04-28T11:47:57Zurn:sha1:a1d11f2e9cc3678bd68b95c0e444c8245ef776b5Some const correctness.2021-09-27T11:41:46ZCarl Hetheringtoncth@carlh.net2021-09-14T22:42:15Zurn:sha1:c59981ce92898f6be6987f10ebb29161e36e6766std::shared_ptr2021-01-07T21:48:29ZCarl Hetheringtoncth@carlh.net2021-01-04T20:16:53Zurn:sha1:dd9be86db6cde0afa5da0d1d1ac43b42e05dca26Put Time types in dcpomatic namespace.2019-05-10T22:43:55ZCarl Hetheringtoncth@carlh.net2019-05-08T22:41:42Zurn:sha1:c4403784febdbdd42e9c32e67fadb147f11fe566Remove TextType from various places as (I believe) it can be inferred from the content.2018-08-23T10:19:06ZCarl Hetheringtoncth@carlh.net2018-08-23T10:19:06Zurn:sha1:7962e6cfd5fbd97e1e44aebe3fc190c62da027e9More 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
Clean up after previous commit.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T21:44:53Zurn:sha1:27b83475435dda4e84a90cf59a52f150905c4ab1Reword 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
Text to player with types.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T20:23:26Zurn:sha1:0ab83642f0c96ae2681beae04873b3226338a570