summaryrefslogtreecommitdiff
path: root/src/combine.cc
AgeCommit message (Collapse)Author
2026-02-03Catch another exception from create_hard_link on Windows.v1.10.48Carl Hetherington
This is attempt to fix an uncaught "Fonction incorrecte" when using the combiner.
2025-11-10Fall back to copy also on operation_not_supported.v1.10.39Carl Hetherington
I haven't seen this but it was reported, and it seems like a good reason to copy instead.
2025-08-25Write subtitles and fonts to subdirectories when combining Interop (#3079).v1.10.25Carl Hetherington
2025-08-25Improve comment.Carl Hetherington
2025-08-25Don't write subtitles to combined Interop DCPs twice (#3079).Carl Hetherington
2025-08-19Compress an if.Carl Hetherington
2025-08-19White space: combine.{cc,h}Carl Hetherington
2025-01-01Replace raw_convert<string> with direct calls to fmt.v1.10.3Carl Hetherington
2024-08-17{,Interop,SMPTE}SubtitleAsset -> {,Interop,SMPTE}TextAsset.Carl Hetherington
2023-10-09Add wrappers around boost::filesystem methods that handle theCarl Hetherington
required mangling of long filenames on Windows. Also wrap lots of missing places (e.g. calls to asdcplib, libxml++, libcxml etc.) in dcp::filesystem::fix_long_path(). The idea is to keep paths un-mangled until they we call some filesystem-related API and mangle them at that point. Otherwise we end up serialising mangled names, which seems like it will not end well. Should fix DoM #2623.
2023-04-14Replace slightly weird add_font_assets() API.Carl Hetherington
2023-04-13Add font assets to combined DCPs; otherwise the fonts don't show up in the ↵Carl Hetherington
ASSETMAP.
2022-04-25Tidy up write_xml() API a little.Carl Hetherington
2021-04-12Specify CPL standard on construction.Carl Hetherington
Then choose which standard DCP should use based on the CPL(s).
2021-03-17Fix combining when two DCPs both contain copies of the same asset.Carl Hetherington
2021-01-24Tidying.Carl Hetherington
2021-01-22Assorted c++11 cleanups.Carl Hetherington
2021-01-17Replace std::list with std::vector in the API.Carl Hetherington
2021-01-08std::shared_ptrCarl Hetherington
2020-09-21Adapt for changes in parent branch, and test churn.Carl Hetherington
2020-09-17Add dcp::combine().Carl Hetherington