dcpomatic/src/lib/content_factory.cc, branch main DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=main 2025-10-15T20:33:26Z Disable use of stream IDs if there are duplicates, rather than rewriting. 2025-10-15T20:33:26Z Carl Hetherington cth@carlh.net 2025-10-14T15:02:15Z urn:sha1:2d8d05c2e7ad67ebac2ff250670a219a891d09ca It turns out that FFmpeg decoders (e.g. flv, see FFmpeg 25faaa311a74efdfdc4fed56996d7338ed807488) check stream IDs and sometimes create new streams if they see one that they didn't see before. If we change stream IDs we break this. Here we try to use stream indices in cases where the IDs are duplicated. We also account for the case where a new stream appears during examination. This wasn't covered by tests until the FFmpeg commit mentioned above, were the flv decoder creates a new stream during examination of boon_telly.mkv. Remove compose.hpp includes. 2025-07-10T18:50:32Z Carl Hetherington cth@carlh.net 2025-07-09T20:58:37Z urn:sha1:bad01065584014aee4024e7cbc4a66acac7617e1 sed -i "/include.*compose.hpp/d;" src/lib/*.cc src/wx/*.cc src/wx/*.h src/tools/*.cc src/lib/*.h test/*.cc Replace String::compose with fmt. 2025-07-10T18:50:32Z Carl Hetherington cth@carlh.net 2025-07-09T20:53:27Z urn:sha1:62c34b28567a097e8f22576e7d7891bd3dbe0ac0 sed -i "/Plural-Forms/n;/%100/n;/scanf/n;s/%[123456789]/{}/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc src/lib/po/*.po src/wx/po/*.po src/tools/po/*.po test/*.cc sed -i "s/String::compose */fmt::format/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc test/*.cc Convert some paths to string. 2025-07-10T18:50:32Z Carl Hetherington cth@carlh.net 2025-07-09T19:55:15Z urn:sha1:7a4763153548619b379222d5c22d10b238ba0ac3 Support FCP XML files containing subtitles (#2909). 2024-12-26T16:20:25Z Carl Hetherington cth@carlh.net 2024-12-06T16:46:24Z urn:sha1:54e2644ed4dcc4faf5135e60926cfdda14886fea Cleanup: header sorting. 2024-12-26T16:20:25Z Carl Hetherington cth@carlh.net 2024-12-06T16:46:06Z urn:sha1:a8b96e31ddb5a08a7d90ec16490c2727be5f4854 Fix thinko in relative path change. 2024-09-18T08:41:19Z Carl Hetherington cth@carlh.net 2024-09-16T08:10:46Z urn:sha1:a9cb7313f7846f8b2bf9f96d19cf28abd7caf7fc We have to canonicalise relative paths with respect to the film's directory on load, otherwise we try to use the relative path and it's interpreted against the current working directory. This unfortunately requires the film's directory to be piped into quite a lot of new places. Adapt to some libdcp class renaming to allow open captions/closed subtitles. 2024-09-03T15:02:24Z Carl Hetherington cth@carlh.net 2024-08-06T21:57:22Z urn:sha1:f3ab77e34a41ad4d8f5156e9d6598314975b9565 Replace deprecated leaf() with filename(). 2023-11-12T21:11:27Z Carl Hetherington cth@carlh.net 2023-11-11T00:31:58Z urn:sha1:dfa7b94e802b05bba4243381460eef96626102a0 Use dcp::filesystem to wrap filesystem calls and fix_long_path 2023-10-09T21:38:28Z Carl Hetherington cth@carlh.net 2023-10-06T00:37:16Z urn:sha1:96f50dd5e600925488fdd9db1580aa01b026269b anything that is passed to read_file() from libcxml. This should fix #2623 and other similar problems.