summaryrefslogtreecommitdiff
path: root/src/dcp.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-02 21:51:56 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-02 21:51:56 +0100
commit8fca5499789ae1deb2dbcad8d3501a8f42fb95f0 (patch)
treef77fd52ac2ade3f14eb686a3dfcd23d3d1277824 /src/dcp.h
parent0884b93386c0b6858eae0236d75a4eba12176219 (diff)
Clean up DCP comparison a bit.
Diffstat (limited to 'src/dcp.h')
-rw-r--r--src/dcp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dcp.h b/src/dcp.h
index 79be5ca5..1ae5cf97 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -83,7 +83,7 @@ public:
std::list<boost::shared_ptr<const Asset> > assets () const;
- std::list<std::string> equals (CPL const & other, EqualityOptions options) const;
+ bool equals (CPL const & other, EqualityOptions options, std::list<std::string>& notes) const;
void write_xml () const;
void write_to_assetmap (std::ostream& s) const;
@@ -139,10 +139,10 @@ public:
/** Compare this DCP with another, according to various options.
* @param other DCP to compare this one to.
* @param options Options to define just what "equality" means.
- * @return An empty list if the DCPs are equal; otherwise a list of messages
- * which explain the ways in which they differ.
+ * @param notes Filled in with notes about differences.
+ * @return true if the DCPs are equal according to EqualityOptions, otherwise false.
*/
- std::list<std::string> equals (DCP const & other, EqualityOptions options) const;
+ bool equals (DCP const & other, EqualityOptions options, std::list<std::string>& notes) const;
void add_cpl (boost::shared_ptr<CPL> cpl);