From: Carl Hetherington Date: Sat, 29 Jul 2023 00:25:32 +0000 (+0200) Subject: Add equality option sound_assets_can_differ. X-Git-Tag: v1.8.75~5 X-Git-Url: https://git.carlh.net/gitweb/?p=libdcp.git;a=commitdiff_plain;h=03609704034192ae157f6328024989eec58ac1c3 Add equality option sound_assets_can_differ. --- diff --git a/src/equality_options.h b/src/equality_options.h index f20e1eb5..1c29be7e 100644 --- a/src/equality_options.h +++ b/src/equality_options.h @@ -75,6 +75,7 @@ public: /** true if IssueDate nodes can differ */ bool issue_dates_can_differ = false; bool load_font_nodes_can_differ = false; + bool sound_assets_can_differ = false; bool keep_going = false; /** true to save the last pair of different image subtitles to the current working directory */ bool export_differing_subtitles = false; diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 57110b4f..c31f8bf4 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -133,6 +133,10 @@ SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Lan bool SoundAsset::equals(shared_ptr other, EqualityOptions const& opt, NoteHandler note) const { + if (opt.sound_assets_can_differ) { + return true; + } + ASDCP::PCM::MXFReader reader_A; DCP_ASSERT (file()); auto r = reader_A.OpenRead (file()->string().c_str());