summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
AgeCommit message (Collapse)Author
2020-10-28Prevent import of directories as DCPs if they do not have anCarl Hetherington
ASSETMAP{,.xml} in the top level. This should avoid some confusion, as previously DoM would scan the whole directory tree looking for an ASSETMAP. It also prevents people adding a DCP-o-matic project to itself, which I believe is the cause of #1620.
2020-10-21macOS / new boost build fixes.v2.15.104Carl Hetherington
2020-10-17Fix deadlock when changing CPL in the player (#1827).Carl Hetherington
TextContent::set_dcp_track can end up requesting a view update, which involves calls to methods in Content which lock the Content::_mutex. Do these calls without a lock on that mutex held. Also, it looks like we would append to texts on every call to examine(). Fix that so that we replace the texts list on each examine() call.
2020-09-27Fixes for new libdcp with multiple content versions.Carl Hetherington
2020-07-29Recover information about closed caption tracks when loading DCPsv2.15.93Carl Hetherington
so that they can be displayed.
2020-06-19Fix hanging butler due to nasty signal ordering problems.v2.15.83Carl Hetherington
2020-06-19Missing setup of AtmosContent in DCP.Carl Hetherington
2020-06-19Fix serialisation of the Atmos parts of a DCP.Carl Hetherington
2020-06-19Make Atmos content work more like other content. Now its MXFsv2.15.82Carl Hetherington
are re-written, meaning that they can be encrypted. This (along with the libdcp update) also fixes assorted Atmos bugs.
2020-05-21Fix enabled/disable overlapping video/audio with DCP content (part of #1355)Carl Hetherington
2020-04-21Allow DCP content to store and serialise metadata.Carl Hetherington
2020-04-21Add DCPContent::resolution().Carl Hetherington
2020-04-21Allow DCPContent to recover and serialise marker positions.Carl Hetherington
2020-04-14DCPReadError -> ReadError in libdcp.Carl Hetherington
2019-11-12Fix crash when calling DCPContent::examine with no film.v2.15.33Carl Hetherington
2019-08-30Make player more tolerant of some DCP errors.Carl Hetherington
2019-05-10Put Time types in dcpomatic namespace.Carl Hetherington
2019-03-29Don't crash when loading DCPs with multiple CCAP assets per reel (part of ↵v2.13.140Carl Hetherington
#1516).
2019-02-12Try to fix some warnings.Carl Hetherington
2018-12-21Fix encrypted DCP playback.Carl Hetherington
2018-12-12Fix content properties (#1428).Carl Hetherington
2018-11-24Fix tests.Carl Hetherington
2018-11-23Remove required Film from content examine.Carl Hetherington
2018-11-23Move make_default into AudioMapping.Carl Hetherington
2018-11-21Tidy and fix logging.Carl Hetherington
2018-11-21Add and use new FrameRateChange constructors.Carl Hetherington
2018-11-21Put Film pointer into Decoder.Carl Hetherington
2018-11-21Take Film pointer out of Content.Carl Hetherington
2018-11-15Better error message when loading a DCP with no ASSETMAP{,.xml}Carl Hetherington
2018-11-11More DCP import logging.Carl Hetherington
2018-10-14Give a better reason for not referencing when there is a 2K/4K mismatch.v2.13.61Carl Hetherington
2018-09-29swaroop: Disable play/stop/pause and slider during ad content.Carl Hetherington
2018-09-14Basic and rather clumsy option to respect KDM validity windows.Carl Hetherington
2018-08-22Fix build with multiple closed captions.Carl Hetherington
2018-08-21Make Content::_paths private.Carl Hetherington
2018-08-20Make ContentChange into a generic ChangeSignaller and use it for Filmv2.13.44Carl Hetherington
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.
2018-08-14More fixes for errors / crashes / misbehaviour with content changesCarl Hetherington
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.
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-21Basics of multiple captions per content so that DCPContent canCarl Hetherington
hold subs and closed captions.
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-08Fix crash with missing DCP content.v2.13.27Carl Hetherington
2018-04-27Fix incorrect container size when loading a VF/OV combination into the player.Carl Hetherington
2018-04-26Signal when streams change and rebuild player pieces when it happens.Carl Hetherington
2018-03-27Tweak wording of DCP referencing tips.Carl Hetherington
2018-03-27why_not in can_reference can just be a string rather than a list of strings.Carl Hetherington
2018-02-08typeid() doesn't seem to downcast, so just check types in the ↵Carl Hetherington
take_settings_from methods (#1192).