dcpomatic/src/lib/wscript, branch v2.13.44DCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=v2.13.442018-08-20T22:29:21ZMake ContentChange into a generic ChangeSignaller and use it for Film2018-08-20T22:29:21ZCarl Hetheringtoncth@carlh.net2018-08-20T22:01:14Zurn:sha1:5dbd022f3abb0ebab57fb67073a07ed60df902a6
changes, since we setup_pieces() in response to at least one of these and
hence we must know before it happens so we can suspend the butler and player.
More fixes for errors / crashes / misbehaviour with content changes2018-08-13T23:05:06ZCarl Hetheringtoncth@carlh.net2018-08-13T16:37:52Zurn:sha1:1fe6bd7f8ba059322b8357b2210f0fd590567ce2
and the butler.
Here we signal both before and after a change in content. Before,
the player disables itself so that any pass()/seek() will be no-ops.
After, the player rebuilds its pieces and the butler re-seeks to
get back to where it was before the change.
Get closed caption view data from the butler, rather than the player.2018-08-05T00:15:45ZCarl Hetheringtoncth@carlh.net2018-08-05T00:15:45Zurn:sha1:3a7b6acdb993864f319a6ceb3bc4c3fb7d4aaefd
You can't introduce the butler (so that the player is ahead of time)
and then ask the player what should be in the frame that is being
displayed "now"; the player will already have moved on.
More 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:0ab83642f0c96ae2681beae04873b3226338a570Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T18:58:30Zurn:sha1:ae95d9cab28e414245e15ddeae20e96735594a8bPlainText -> PlainTextFile.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T13:36:04Zurn:sha1:507a389e9c5f84ec1d51e7566e38fbf42f658537More 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