X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftypes.h;h=edabb9e233b9c9595e704fb5a7831bd003193bc9;hb=62701cd6827b885fdfaef5159a542ea25a6c24b7;hp=433a910cddf9423ca9d63281f881a2419beaa9dc;hpb=479629b2a8fd1b6341e76d7aaa5cf9e6507d5634;p=libdcp.git

diff --git a/src/types.h b/src/types.h
index 433a910c..edabb9e2 100644
--- a/src/types.h
+++ b/src/types.h
@@ -24,6 +24,8 @@
 #ifndef LIBDCP_TYPES_H
 #define LIBDCP_TYPES_H
 
+#include <string>
+
 namespace libdcp
 {
 
@@ -98,13 +100,29 @@ struct EqualityOptions {
 		: max_mean_pixel_error (0)
 		, max_std_dev_pixel_error (0)
 		, max_audio_sample_error (0)
+		, cpl_names_can_differ (false)
+		, mxf_names_can_differ (false)
 	{}
 
 	double max_mean_pixel_error;
 	double max_std_dev_pixel_error;
 	int max_audio_sample_error;
+	bool cpl_names_can_differ;
+	bool mxf_names_can_differ;
 };
 
+/* Win32 defines this */	
+#undef ERROR
+
+enum NoteType {
+	PROGRESS,
+	ERROR,
+	NOTE
+};
+
+/** @class Color
+ *  @brief An RGB color (aka colour).
+ */
 class Color
 {
 public:
@@ -112,9 +130,9 @@ public:
 	Color (int r_, int g_, int b_);
 	Color (std::string argb_hex);
 
-	int r;
-	int g;
-	int b;
+	int r; ///< red component, from 0 to 255
+	int g; ///< green component, from 0 to 255
+	int b; ///< blue component, from 0 to 255
 
 	std::string to_argb_string () const;
 };