summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-24Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomaticv2.13.38Carl Hetherington
2018-07-24Fix uninitialised variable.Carl Hetherington
2018-07-24Fix image filename sorter with filenames that have lots of numbers.Carl Hetherington
2018-07-23Introduce the idea of unknown original subtitle type to clean up the GUI a bit.Carl Hetherington
2018-07-23Tidy up after mass rename.Carl Hetherington
2018-07-23More automated renaming.Carl Hetherington
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
2018-07-23Update to test/data.Carl Hetherington
2018-07-23Some missing bits of caption type setup.Carl Hetherington
2018-07-23Commenting.v2.13.37Carl Hetherington
2018-07-23Get ccaps by asking the Player, rather than by listening to its emissions,Carl Hetherington
which is slightly cleaner and works when subtitles are emitted with an unknown end time. Also add CCAPs to the player.
2018-07-23Remove debug code.Carl Hetherington
2018-07-23Very basic closed caption viewer.Carl Hetherington
2018-07-22No-op: white space.Carl Hetherington
2018-07-22On reflection showing CCAPs over the main picture doesn't make much sense.Carl Hetherington
2018-07-22Display only required tabs, including subs / ccap.Carl Hetherington
2018-07-21Fix failure to load projects.Carl Hetherington
2018-07-21Fix join for new caption stuff.Carl Hetherington
2018-07-21Fix crash.Carl Hetherington
2018-07-21Revert "Remove join function; the code is long and I don't think anybody"Carl Hetherington
It turns out Carsten uses it :) This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.
2018-07-21Basics of multiple captions per content so that DCPContent canCarl Hetherington
hold subs and closed captions.
2018-07-20Key ActiveCaptions on a CaptionContent rather than a Piece.Carl Hetherington
2018-07-20Thinko in previous.Carl Hetherington
2018-07-20Put caption details inside their own tag in the metadata.Carl Hetherington
2018-07-20Remove join function; the code is long and I don't think anybodyCarl Hetherington
uses it.
2018-07-20Update preview when caption type changes.Carl Hetherington
2018-07-20Untested; allow viewing of subtitles or closed captions in the preview.Carl Hetherington
2018-07-20Add advanced configuration option to allow any container ratio,Carl Hetherington
specifically because the GDC SX-2001 will only play 25fps DCPs with a 16:9 ratio (not Flat). https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4470
2018-07-20Fix incorrect type name.Carl Hetherington
2018-07-20Hopefully remove unsafe-loop-optimization warnings.Carl Hetherington
2018-07-20caption -> subtitle.v2.13.36Carl Hetherington
2018-07-20ChangeLog update.Carl Hetherington
2018-07-19Add very basic test.Carl Hetherington
2018-07-19Untested writing of CCAP.Carl Hetherington
2018-07-19White space.Carl Hetherington
2018-07-19More subtitle -> caption.Carl Hetherington
2018-07-19Rename subtitle appearance dialogue.Carl Hetherington
2018-07-19Clean up after previous commit.Carl Hetherington
2018-07-19Reword again: Text -> Caption and Plain -> Text.Carl Hetherington
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
2018-07-19Fix warning.Carl Hetherington
2018-07-19Get types into ReelWriter.Carl Hetherington
2018-07-19Text to player with types.Carl Hetherington
2018-07-19UI for selecting caption type.Carl Hetherington
2018-07-19Finish PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.Carl Hetherington
2018-07-19Remove unused file.Carl Hetherington
2018-07-19Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> ↵Carl Hetherington
PlainText.
2018-07-19PlainText -> PlainTextFile.Carl Hetherington
2018-07-19Remove old content_subtitle.Carl Hetherington
2018-07-19Remove -j4 from suggested build copmmand.Carl Hetherington
2018-07-19More renaming.Carl Hetherington
2018-07-19More old stuff.Carl Hetherington
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 20:36:04 +0000