dcpomatic/src/lib/dcp_encoder.cc, branch v2.13.37DCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=v2.13.372018-07-21T14:16:18ZBasics of multiple captions per content so that DCPContent can2018-07-21T14:16:18ZCarl Hetheringtoncth@carlh.net2018-07-21T14:16:18Zurn:sha1:cbd4450197a083bf58bda510e626f73ba583cb66
hold subs and closed captions.
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
Get types into ReelWriter.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T20:33:52Zurn:sha1:11fe3ab56ad59b8b5525fa795d44d2323ef6d5b8Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T18:58:30Zurn:sha1:ae95d9cab28e414245e15ddeae20e96735594a8bRename Subtitle -> Text2018-07-19T22:36:56ZCarl Hetheringtoncth@carlh.net2018-06-11T22:50:59Zurn:sha1:d7ac100c0eb1b5efdcfbec59be870fd869252840
sed -i "s/SubtitleContent/TextContent/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/SubtitleDecoder/TextDecoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/subtitle_content/text_content/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript src/wx/wscript
sed -i "s/subtitle_decoder/text_decoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/subtitle_decoder.cc src/lib/text_decoder.cc
mv src/lib/subtitle_decoder.h src/lib/text_decoder.h
mv src/lib/subtitle_content.cc src/lib/text_content.cc
mv src/lib/subtitle_content.h src/lib/text_content.h
mv src/lib/dcp_subtitle_decoder.cc src/lib/dcp_text_decoder.cc
mv src/lib/dcp_subtitle_decoder.h src/lib/dcp_text_decoder.h
mv src/lib/dcp_subtitle_content.cc src/lib/dcp_text_content.cc
mv src/lib/dcp_subtitle_content.h src/lib/dcp_text_content.h
mv src/lib/text_subtitle_content.cc src/lib/text_text_content.cc
mv src/lib/text_subtitle_content.h src/lib/text_text_content.h
mv src/lib/text_subtitle_decoder.cc src/lib/text_text_decoder.cc
mv src/lib/text_subtitle_decoder.h src/lib/text_text_decoder.h
mv src/wx/timeline_subtitle_content_view.cc src/wx/timeline_text_content_view.cc
mv src/wx/timeline_subtitle_content_view.h src/wx/timeline_text_content_view.h
Don't write multiple <LoadFont> tags to Interop subtitles (#1273).2018-07-09T19:10:09ZCarl Hetheringtoncth@carlh.net2018-07-09T19:10:09Zurn:sha1:fa2c49210c9fcf0f26205927aec0aceb13ca69ceRemove duplicate variables.2018-02-27T14:26:42ZCarl Hetheringtoncth@carlh.net2018-02-27T14:26:42Zurn:sha1:ce43e15b4fd3d22470e319991391498ed32f19edPreviously the code did not account for referenced audio, so far2017-12-29T01:11:22ZCarl Hetheringtoncth@carlh.net2017-12-29T01:11:22Zurn:sha1:60d528017a3ac1afdc30a3a000b28dda96a2175e
as I can see. It decided which reel to write new audio to based on
how many frames had been written to the current reel; this makes
no sense for referred reels for which the player will emit no audio.
This code looks at the audio timestamp instead.
Fix incorrect reel lengths in some cases; account for emitted data being rejected by the player, and for initial audio not to be at time 0.2017-08-29T23:59:26ZCarl Hetheringtoncth@carlh.net2017-08-29T23:59:26Zurn:sha1:9ba99535750e19c341f6ff535c6c8991658a8fbb