Clean up DCP comparison a bit.

[libdcp.git] / src / picture_asset.h

diff --git a/src/picture_asset.h b/src/picture_asset.h
index baea22c3098487c0c70acc68f6b0d95d2f1f3161..da3eb7d00e9f5e7bfdb21bfc143e8c1833d86ea5 100644 (file)
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -41,7 +41,7 @@ public:
         */
        void write_to_cpl (std::ostream& s) const;
 
-       std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
 
        int width () const {
                return _width;
@@ -53,8 +53,9 @@ public:
 
 protected:     
 
-       std::list<std::string> frame_buffer_equals (
-               int frame, EqualityOptions opt, uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
+       bool frame_buffer_equals (
+               int frame, EqualityOptions opt, std::list<std::string>& notes,
+               uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
                ) const;
        
        /** picture width in pixels */
@@ -114,7 +115,7 @@ public:
        MonoPictureAsset (std::string directory, std::string mxf_name, int fps, int entry_point, int length);
        
        boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
-       std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
 
 private:
        std::string path_from_list (int f, std::vector<std::string> const & files) const;
@@ -128,7 +129,7 @@ public:
        StereoPictureAsset (std::string directory, std::string mxf_name, int fps, int entry_point, int length);
        
        boost::shared_ptr<const StereoPictureFrame> get_frame (int n) const;
-       std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
 };