summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
AgeCommit message (Collapse)Author
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-22Display only required tabs, including subs / ccap.Carl Hetherington
2018-07-21Fix join for new caption stuff.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-20Remove join function; the code is long and I don't think anybodyCarl Hetherington
uses it.
2018-07-19Clean up after previous commit.Carl Hetherington
2018-07-19Rename Subtitle -> TextCarl Hetherington
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
2018-06-08Auto-rotate videos.Carl Hetherington
2018-06-08Remove details video properties from non-video content XML.Carl Hetherington
2018-05-13Update to match new FFmpeg; fixes #1296.Carl Hetherington
2018-02-08typeid() doesn't seem to downcast, so just check types in the ↵Carl Hetherington
take_settings_from methods (#1192).
2018-01-05s/use_template/take_settings_from/gCarl Hetherington
2017-08-31Fix erroneous re-use of video files after turning off burnt subtitles (#1113).Carl Hetherington
2017-05-13Get initial colour conversion from FFmpeg header, if it's understood (#993).Carl Hetherington
2017-04-19Basic grunt-work, untested and unfinished, but it compiles.Carl Hetherington
2016-12-16Fix for new bits in FFmpeg (#1033).Carl Hetherington
2016-08-24Basic template support (#485).Carl Hetherington
2016-08-24Revert "Bump libdcp for new method."Carl Hetherington
This reverts commit 3412af70b950dcdc604413ef05c26becda6da789.
2016-08-24Bump libdcp for new method.Carl Hetherington
2016-08-12Move locale_convert into libdcp.Carl Hetherington
2016-08-12Replace incorrect uses of raw_convert with a new locale_convert.Carl Hetherington
2016-08-12Move raw_convert into libdcp.Carl Hetherington
2016-08-12Remove all use of stringstream in an attempt to fixCarl Hetherington
the suspected thread-unsafe crash bugs on OS X.
2016-07-22Rename SafeStringStream -> locked_stringstream. Bump deps for removal of ↵Carl Hetherington
stringstream.
2016-07-10Fix crash on opening properties window for FFmpeg content.Carl Hetherington
2016-06-30Fix for crash(es) when joining content.Carl Hetherington
2016-06-21Revert "Use make_shared<>."Carl Hetherington
Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
2016-06-21Use make_shared<>.Carl Hetherington
2016-06-14Basic guessing of audio channels from filenames (#393).Carl Hetherington
2016-06-02Fix crash when loading old state files.Carl Hetherington
2016-06-02Fix missing content properties when using translations.Carl Hetherington
2016-06-01Fix crash with multiple audio streams.Carl Hetherington
2016-05-31Fix crash on opening properties for audio-only files.Carl Hetherington
2016-05-25No-op; fix GPL address and use the explicit-program-name version.Carl Hetherington
2016-05-23Fix two crashes with Debian-shipped FFmpeg.Carl Hetherington
2016-05-18Remove unnecessary Film variable in ContentPart.Carl Hetherington
2016-05-18Fix crash.Carl Hetherington
2016-05-18Fix a few crashes.Carl Hetherington
2016-05-18Better summaries for FFmpeg content in the list.Carl Hetherington
2016-05-18Fix crash with no video.Carl Hetherington
2016-05-18Use audio length in FFmpegContent if there is no video.Carl Hetherington
2016-05-18Partial work on using a no-video FFmpeg file.Carl Hetherington
2016-05-18Some allowances for video/audio/subtitle possibly being null.Carl Hetherington
2016-05-18Allow content parts to not be preset in XML.Carl Hetherington
2016-05-18Move video frame rate ('prepared-for') into Content.Carl Hetherington
2016-05-18Fiddle with some subtitle methods.Carl Hetherington
2016-05-18Fix some confusions with FFmpeg audio streams.Carl Hetherington
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-08 21:59:45 +0000