Cleanup: pass EqualityOptions as const&

[libdcp.git] / src / dcp.h

diff --git a/src/dcp.h b/src/dcp.h
index 9811b60d6e2a5f65ecbdb664803862ac3d1a796a..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);
 
@@ -151,12 +151,13 @@ public:
        void set_annotation_text(std::string annotation_text);
 
        /** Write all the XML files for this DCP.
-        *  @param standand INTEROP or SMPTE
         *  @param signer Signer to use
+        *  @param include_mca_subdescriptors true to write MCA subdescriptors to CPLs.
         *  @param name_format Name format to use for the CPL and PKL filenames
         */
-       void write_xml (
+       void write_xml(
                std::shared_ptr<const CertificateChain> signer = std::shared_ptr<const CertificateChain>(),
+               bool include_mca_subdescriptors = true,
                NameFormat name_format = NameFormat("%t")
        );
 
@@ -182,12 +183,16 @@ public:
                return _pkls;
        }
 
-       boost::optional<boost::filesystem::path> asset_map_path() const {
+       boost::optional<boost::filesystem::path> asset_map_file() const {
                if (!_asset_map) {
                        return {};
                }
 
-               return _asset_map->path();
+               return _asset_map->file();
+       }
+
+       boost::optional<AssetMap> asset_map() const {
+               return _asset_map;
        }
 
        static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);