Cleanup: pass EqualityOptions as const&

This exposes a useless assignment of export_differing_subtitles,
which I've removed (and altered the comment accordingly).

diff --git a/src/asset.cc b/src/asset.cc
index 330bd653082fcb1ff6441322b06c640ee76f7ca7..abf9c9c8d0d795cd1d3e1825d65e889aee7aa2b2 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -143,7 +143,7 @@ Asset::hash (function<void (float)> progress) const
 
 
 bool
-Asset::equals(std::shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+Asset::equals(std::shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (_hash != other->_hash) {
                if (!opt.asset_hashes_can_differ) {

diff --git a/src/asset.h b/src/asset.h
index 9f299acc08d8265044c0f1373d4772af6795835b..b88b1167d3c110f1087424805d972d2225667164 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -88,7 +88,7 @@ public:
 
        virtual bool equals (
                std::shared_ptr<const Asset> other,
-               EqualityOptions opt,
+               EqualityOptions const& opt,
                NoteHandler note
                ) const;
 

diff --git a/src/cpl.cc b/src/cpl.cc
index 86b738d99fe843d0850488f7fb57babb2203fab5..f1f01b42a7c3a9ca9ee384eb83a0386820c7da64 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -608,7 +608,7 @@ CPL::reel_file_assets () const
 
 
 bool
-CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+CPL::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        auto other_cpl = dynamic_pointer_cast<const CPL>(other);
        if (!other_cpl) {

diff --git a/src/cpl.h b/src/cpl.h
index 64d08ae96a0a9fe81385ba9660b7e6ddb4ccd1f5..2a2fc827e3acaac6eed0f8e530e9ce666af1d173 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -88,7 +88,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset> other,
-               EqualityOptions options,
+               EqualityOptions const& options,
                NoteHandler note
                ) const override;
 

diff --git a/src/dcp.cc b/src/dcp.cc
index 3b267090580e2b1b97bd0e6dadc9e43ebb5c2f77..7c253a17c82c69567dd76b6627d3298f263b6bd5 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -337,7 +337,7 @@ DCP::resolve_refs (vector<shared_ptr<Asset>> assets)
 
 
 bool
-DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
+DCP::equals(DCP const & other, EqualityOptions const& opt, NoteHandler note) const
 {
        auto a = cpls ();
        auto b = other.cpls ();

diff --git a/src/dcp.h b/src/dcp.h
index bf9b3aaf03da832ec938d8497ce80e4048a1a582..f4b6961580a0c36ec4349b818f17ba0873dea7bb 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -124,7 +124,7 @@ public:
         *  @param note Functor to handle notes made by the equality operation.
         *  @return true if the DCPs are equal according to EqualityOptions, otherwise false.
         */
-       bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const;
+       bool equals(DCP const & other, EqualityOptions const& options, NoteHandler note) const;
 
        void add (std::shared_ptr<CPL> cpl);
 

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index d0c80f5e8300d8201e0047d3d9233371d853dede..e7c1432b75ee56b6972020a85c4c93175aaa275e 100644 (file)
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -140,7 +140,7 @@ InteropSubtitleAsset::add_font (string load_id, dcp::ArrayData data)
 
 
 bool
-InteropSubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions options, NoteHandler note) const
+InteropSubtitleAsset::equals(shared_ptr<const Asset> other_asset, EqualityOptions const& options, NoteHandler note) const
 {
        if (!SubtitleAsset::equals (other_asset, options, note)) {
                return false;

diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index 3005c8fc1249cb7fc6e16b8902dda55d3638af9d..f63740d54fcbd4c793071f0ed68722b407bbcc63 100644 (file)
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_subtitle_asset.h
@@ -65,7 +65,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset>,
-               EqualityOptions,
+               EqualityOptions const&,
                NoteHandler note
                ) const override;
 

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index cdfcb0df543efef7b762f8e82bf9af73ab2a2f4e..b58a5d89a380b291ed5352340b1e4cd5559cdee0 100644 (file)
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -101,7 +101,7 @@ storing_note_handler (list<pair<NoteType, string>>& notes, NoteType t, string s)
 
 
 bool
-MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+MonoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!dynamic_pointer_cast<const MonoPictureAsset>(other)) {
                return false;

diff --git a/src/mono_picture_asset.h b/src/mono_picture_asset.h
index 625d6ac8fecb9503b7c0c07b332cdc1175e79e1d..b318d0ad9b89519b7361a1b265037a4c0cd19046 100644 (file)
--- a/src/mono_picture_asset.h
+++ b/src/mono_picture_asset.h
@@ -79,7 +79,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset> other,
-               EqualityOptions opt,
+               EqualityOptions const& opt,
                NoteHandler note
                ) const override;
 

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index f77ce820c2262e28624b43890fe362f597738227..56f383e08e4a1e20924d7fd75b74571813f5f0aa 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -137,7 +137,7 @@ PictureAsset::descriptor_equals (
 
 bool
 PictureAsset::frame_buffer_equals (
-       int frame, EqualityOptions opt, NoteHandler note,
+       int frame, EqualityOptions const& opt, NoteHandler note,
        uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
        ) const
 {

diff --git a/src/picture_asset.h b/src/picture_asset.h
index 236eca223b64d72b348ae7fa52c0393389eefa24..d9f30ecee9548f69af24479922b802a786dc754f 100644 (file)
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -122,7 +122,7 @@ protected:
        friend class StereoPictureAssetWriter;
 
        bool frame_buffer_equals (
-               int frame, EqualityOptions opt, NoteHandler note,
+               int frame, EqualityOptions const& opt, NoteHandler note,
                uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
                ) const;
 

diff --git a/src/reel.cc b/src/reel.cc
index 49fe0360221ddd88d72b80b83bd1f4dde904f885..454028cd0f31f5320c42121c727c24a505a8141a 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -179,7 +179,7 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
 
 
 bool
-Reel::equals (std::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler note) const
+Reel::equals(std::shared_ptr<const Reel> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
                note (NoteType::ERROR, "Reel: picture assets differ");

diff --git a/src/reel.h b/src/reel.h
index 60b5a64bb873808f64a1673b2572f9237be60949..d011ec4bbb1891b783d1ec08a7c8e93d1bb9c3f2 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -133,7 +133,7 @@ public:
        bool any_encrypted () const;
        bool all_encrypted () const;
 
-       bool equals (std::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
+       bool equals(std::shared_ptr<const Reel> other, EqualityOptions const& opt, NoteHandler notes) const;
 
        void add (DecryptedKDM const &);
 

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 6b0cd4d54b233be1dc2c7731bd8dfe16c81a8a80..5b8f3126b5f01a97a18133a36a1ee6581d9e8a94 100644 (file)
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -135,7 +135,7 @@ optional_to_string (optional<T> o)
 
 
 bool
-ReelAsset::asset_equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        auto const node = cpl_node_name(Standard::SMPTE);
 

diff --git a/src/reel_asset.h b/src/reel_asset.h
index 6de7f1bec54fd4206a24325547ad4515d548f35e..e928cb18542694a5bc7f7989be86f04a533e971f 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -132,7 +132,7 @@ public:
                _annotation_text = boost::none;
        }
 
-       bool asset_equals (std::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
+       bool asset_equals(std::shared_ptr<const ReelAsset>, EqualityOptions const&, NoteHandler) const;
 
 protected:
 

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index fe30cea26d19c30298b74db839d3b591a1f55e85..ef39a4eb91cc3c6597df93cb81cce778c44261fd 100644 (file)
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -92,7 +92,7 @@ ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 
 
 bool
-ReelAtmosAsset::equals (shared_ptr<const ReelAtmosAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelAtmosAsset::equals(shared_ptr<const ReelAtmosAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;

diff --git a/src/reel_atmos_asset.h b/src/reel_atmos_asset.h
index 6ceec9848e5ccc7157e16143bf747f6fdaebf4b1..298cbbfd2b0f96625f7cbceff2dff693481297cf 100644 (file)
--- a/src/reel_atmos_asset.h
+++ b/src/reel_atmos_asset.h
@@ -69,7 +69,7 @@ public:
        }
 
        xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
-       bool equals (std::shared_ptr<const ReelAtmosAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelAtmosAsset>, EqualityOptions const&, NoteHandler) const;
 
 private:
        boost::optional<std::string> key_type () const override {

diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index b72a3558b16ca84a4673445c58addfddffbfc641..e5649d6a407b3b331909c0ea33bf403d84852d6a 100644 (file)
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -75,7 +75,7 @@ ReelClosedCaptionAsset::ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node
 
 
 bool
-ReelClosedCaptionAsset::equals (shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelClosedCaptionAsset::equals(shared_ptr<const ReelClosedCaptionAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;

diff --git a/src/reel_closed_caption_asset.h b/src/reel_closed_caption_asset.h
index 001026109c5b9bd27f168301b427ab4f8a883222..405de34b2e2cff77090555a5b452a7ca3e993d0d 100644 (file)
--- a/src/reel_closed_caption_asset.h
+++ b/src/reel_closed_caption_asset.h
@@ -70,7 +70,7 @@ public:
                return asset_of_type<SubtitleAsset>();
        }
 
-       bool equals (std::shared_ptr<const ReelClosedCaptionAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelClosedCaptionAsset>, EqualityOptions const&, NoteHandler) const;
 
        void set_language (dcp::LanguageTag l) {
                _language = l.to_string();

diff --git a/src/reel_file_asset.cc b/src/reel_file_asset.cc
index dc8ea21f449e687be939c9ab3c53090484ef7ea2..51b94879400e57b1a37a3f8ce440d25331c5e454 100644 (file)
--- a/src/reel_file_asset.cc
+++ b/src/reel_file_asset.cc
@@ -74,7 +74,7 @@ ReelFileAsset::ReelFileAsset (shared_ptr<const cxml::Node> node)
 
 
 bool
-ReelFileAsset::file_asset_equals (shared_ptr<const ReelFileAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelFileAsset::file_asset_equals(shared_ptr<const ReelFileAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (_hash != other->_hash) {
                if (!opt.reel_hashes_can_differ) {

diff --git a/src/reel_file_asset.h b/src/reel_file_asset.h
index 6ef917abf79f5f8b9ad5f4f6f0d787f84e8ee165..687e0d3eb8fe896134d5aae2f9d37aaffde1ea55 100644 (file)
--- a/src/reel_file_asset.h
+++ b/src/reel_file_asset.h
@@ -79,7 +79,7 @@ public:
                _hash = h;
        }
 
-       bool file_asset_equals (std::shared_ptr<const ReelFileAsset> other, EqualityOptions opt, NoteHandler note) const;
+       bool file_asset_equals(std::shared_ptr<const ReelFileAsset> other, EqualityOptions const& opt, NoteHandler note) const;
 
        virtual boost::optional<std::string> key_type () const {
                return boost::none;

diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 5a07907116f52b6a4dcb30879b2df1693339bace..d71a22ec892dccc6ab91b9c9b2b3d072f2c7563f 100644 (file)
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -120,7 +120,7 @@ ReelMarkersAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 }
 
 bool
-ReelMarkersAsset::equals (shared_ptr<const ReelMarkersAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelMarkersAsset::equals(shared_ptr<const ReelMarkersAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals(other, opt, note)) {
                return false;

diff --git a/src/reel_markers_asset.h b/src/reel_markers_asset.h
index df87dcce9a7367a59a9020c108042af62654f562..2a1480a2d0d8c3bff22af163651148d73422112d 100644 (file)
--- a/src/reel_markers_asset.h
+++ b/src/reel_markers_asset.h
@@ -52,7 +52,7 @@ public:
        explicit ReelMarkersAsset (std::shared_ptr<const cxml::Node>);
 
        xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
-       bool equals (std::shared_ptr<const ReelMarkersAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelMarkersAsset>, EqualityOptions const&, NoteHandler) const;
 
        void set (Marker, Time);
        void unset (Marker);

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 2e51fec5828707f3a60eefe061a0c163956fec91..eb87d03949b2a67be36c97d9133bdb78e5ff60d5 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -125,7 +125,7 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 
 
 bool
-ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelPictureAsset::equals(shared_ptr<const ReelPictureAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 64fa54f4e92a709d1f89442195534626605883f8..bf7d40aacb8010273bda2c5e5bb4ef70f28778f1 100644 (file)
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -68,7 +68,7 @@ public:
        }
 
        virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
-       bool equals (std::shared_ptr<const ReelPictureAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelPictureAsset>, EqualityOptions const&, NoteHandler) const;
 
        /** @return picture frame rate */
        Fraction frame_rate () const {

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 76495c78170f0fec7277d263fe6698dc3871b362..1f2ddcdd78b79d9bcd6b9cedbece7256cfca4ae8 100644 (file)
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -82,7 +82,7 @@ ReelSoundAsset::key_type () const
 
 
 bool
-ReelSoundAsset::equals (shared_ptr<const ReelSoundAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelSoundAsset::equals(shared_ptr<const ReelSoundAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 181bf1d9cb2044555d6755e70c001b6b3360df0e..16d629d1105d3c7e03fab429fd7b6622f6d4ec6b 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -65,7 +65,7 @@ public:
                return asset_of_type<SoundAsset>();
        }
 
-       bool equals (std::shared_ptr<const ReelSoundAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelSoundAsset>, EqualityOptions const&, NoteHandler) const;
 
 private:
        boost::optional<std::string> key_type () const override;

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index 04f5678801b9d65b6fd7604aeb95f6da4b952641..d856a05e0bf1f9f7f1575b6feb7796dcec597aa6 100644 (file)
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -90,7 +90,7 @@ ReelSubtitleAsset::set_language (dcp::LanguageTag language)
 
 
 bool
-ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelSubtitleAsset::equals(shared_ptr<const ReelSubtitleAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;

diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h
index 95013d34e5f0921ed607173ca8cc9bf2595863c6..8b694fd675494ecac9bc9b419faeaedcd4e71d90 100644 (file)
--- a/src/reel_subtitle_asset.h
+++ b/src/reel_subtitle_asset.h
@@ -75,7 +75,7 @@ public:
 
        xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
 
-       bool equals (std::shared_ptr<const ReelSubtitleAsset>, EqualityOptions, NoteHandler) const;
+       bool equals(std::shared_ptr<const ReelSubtitleAsset>, EqualityOptions const&, NoteHandler) const;
 
        void set_language (dcp::LanguageTag language);
 

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 3a58ba8e9830588bbb9aaaa39a41b040df441489..d5838cd521430bd0e0b00a3079afd1b48d27736d 100644 (file)
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -491,7 +491,7 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 }
 
 bool
-SMPTESubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions options, NoteHandler note) const
+SMPTESubtitleAsset::equals(shared_ptr<const Asset> other_asset, EqualityOptions const& options, NoteHandler note) const
 {
        if (!SubtitleAsset::equals (other_asset, options, note)) {
                return false;

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 2632e0a526868bf9216a416dc55b002ce2e9c095..26144fe101be003e4e2c556e5a892afce0446ed9 100644 (file)
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -84,7 +84,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset>,
-               EqualityOptions,
+               EqualityOptions const&,
                NoteHandler note
                ) const override;
 

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index ea952c35fc032420c7a62dfd239948e0bfdae078..d14d3702b6efe12f2421c910776973d6f03325cc 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -130,7 +130,7 @@ SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Lan
 
 
 bool
-SoundAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+SoundAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        ASDCP::PCM::MXFReader reader_A;
        DCP_ASSERT (file());

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 70c3aee7cbe4913cfc0efe751462f9142429879c..125fe94b67322111b1d12389ade37cf47485645f 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -99,7 +99,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset> other,
-               EqualityOptions opt,
+               EqualityOptions const& opt,
                NoteHandler note
                ) const override;
 

diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index cf07c6be6eaed472972177eb8da8a4d6ce5a3b5f..35e3909348daf94740416b6f25bb149359655291 100644 (file)
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -101,7 +101,7 @@ StereoPictureAsset::start_read () const
 
 
 bool
-StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        ASDCP::JP2K::MXFSReader reader_A;
        DCP_ASSERT (file());

diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index 9c9a2fa1b5501300ab08bb8190b55e07d02b0a65..6ee1d423dd992767abb73412e76a095f2b4d7b37 100644 (file)
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -63,7 +63,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset> other,
-               EqualityOptions opt,
+               EqualityOptions const& opt,
                NoteHandler note
                ) const override;
 };

diff --git a/src/subtitle.cc b/src/subtitle.cc
index de3fe03f82cccdffebdc8d8455af2669321df096..65ea9ff5bcb269df71b608fae69153a24b4dccc4 100644 (file)
--- a/src/subtitle.cc
+++ b/src/subtitle.cc
@@ -73,7 +73,7 @@ Subtitle::Subtitle (
 
 
 bool
-Subtitle::equals(shared_ptr<const Subtitle> other, EqualityOptions options, NoteHandler note) const
+Subtitle::equals(shared_ptr<const Subtitle> other, EqualityOptions const& options, NoteHandler note) const
 {
        bool same = true;
 

diff --git a/src/subtitle.h b/src/subtitle.h
index d42a54b7487173060bb8504822ae05cf476549ae..5b7a4f1320acde70931d93f5ad726c740db55fe9 100644 (file)
--- a/src/subtitle.h
+++ b/src/subtitle.h
@@ -125,7 +125,7 @@ public:
                _fade_down_time = t;
        }
 
-       virtual bool equals(std::shared_ptr<const dcp::Subtitle> other, EqualityOptions options, NoteHandler note) const;
+       virtual bool equals(std::shared_ptr<const dcp::Subtitle> other, EqualityOptions const& options, NoteHandler note) const;
 
 protected:
 

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 5a448f3ffd7727b721738daf9be1a0a70da28a44..b7e75419d1d3dd4bc7c4bbb475623f1541acff94 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -541,7 +541,7 @@ SubtitleAsset::latest_subtitle_out () const
 
 
 bool
-SubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions options, NoteHandler note) const
+SubtitleAsset::equals(shared_ptr<const Asset> other_asset, EqualityOptions const& options, NoteHandler note) const
 {
        if (!Asset::equals (other_asset, options, note)) {
                return false;

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index bc5fa8824711cf8d600c6c3763631196916d6e86..e1ca5d15d8979c473c4ecabc06feb6bbe636a68f 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -101,7 +101,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset>,
-               EqualityOptions,
+               EqualityOptions const&,
                NoteHandler note
                ) const override;
 

diff --git a/src/subtitle_image.cc b/src/subtitle_image.cc
index 19d7f4eb7d52225b5bbaccb45015989c8f9f8b94..f8f8b570293f2f893c6e1603df06847a839c3270 100644 (file)
--- a/src/subtitle_image.cc
+++ b/src/subtitle_image.cc
@@ -132,7 +132,7 @@ dcp::operator!= (SubtitleImage const & a, SubtitleImage const & b)
 
 
 bool
-SubtitleImage::equals(shared_ptr<const Subtitle> other_sub, EqualityOptions options, NoteHandler note) const
+SubtitleImage::equals(shared_ptr<const Subtitle> other_sub, EqualityOptions const& options, NoteHandler note) const
 {
        if (!Subtitle::equals(other_sub, options, note)) {
                return false;
@@ -158,7 +158,6 @@ SubtitleImage::equals(shared_ptr<const Subtitle> other_sub, EqualityOptions opti
                        } else {
                                other->png_image().write(base + "B.png");
                        }
-                       options.export_differing_subtitles = false;
                }
                return false;
        }

diff --git a/src/subtitle_image.h b/src/subtitle_image.h
index 8b1c3521aed3db896bd2d4e81ad46b0ebc08f952..11fd3915a8e85cd7ffc0de09d85432b995059e59 100644 (file)
--- a/src/subtitle_image.h
+++ b/src/subtitle_image.h
@@ -105,7 +105,7 @@ public:
                return _file;
        }
 
-       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions options, NoteHandler note) const override;
+       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions const& options, NoteHandler note) const override;
 
 private:
        ArrayData _png_image;

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index 91a129dadd3ab55b22850e6e9523a2c106fe1d25..b627240b60c487563198f612bb47eeab0c99a021 100644 (file)
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -180,7 +180,7 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
 
 
 bool
-SubtitleString::equals(shared_ptr<const Subtitle> other_sub, EqualityOptions options, NoteHandler note) const
+SubtitleString::equals(shared_ptr<const Subtitle> other_sub, EqualityOptions const& options, NoteHandler note) const
 {
        if (!Subtitle::equals(other_sub, options, note)) {
                return false;

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 98ff960b1d7771d17728c5c1b7807ddb718ec9a0..e59ed7c20466895464c721223fa26d25db214d6f 100644 (file)
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -191,7 +191,7 @@ public:
                _effect_colour = c;
        }
 
-       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions options, NoteHandler node) const override;
+       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions const& options, NoteHandler node) const override;
 
 private:
        /** font ID */

diff --git a/src/types.h b/src/types.h
index 947d7e93482330c1e5b3a1f58e70b74fd29f1a05..c7256d0f6ce0470ea7a7235cac9547f63424562c 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -261,7 +261,7 @@ public:
        bool issue_dates_can_differ = false;
        bool load_font_nodes_can_differ = false;
        bool keep_going = false;
-       /** true to save the first pair of different image subtitles to the current working directory */
+       /** true to save the last pair of different image subtitles to the current working directory */
        bool export_differing_subtitles = false;
        /** The maximum allowable absolute difference between the vertical position of subtitles */
        float max_subtitle_vertical_position_error = 0;