Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index ebcfb838a94ea1444f8197f671b89481e42ece72..b1de4a0fc1a499fd4c6748db015781388d313284 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -100,11 +100,22 @@ struct EqualityOptions {
                : max_mean_pixel_error (0)
                , max_std_dev_pixel_error (0)
                , max_audio_sample_error (0)
+               , mxf_names_can_differ (false)
        {}
 
        double max_mean_pixel_error;
        double max_std_dev_pixel_error;
        int max_audio_sample_error;
+       bool mxf_names_can_differ;
+};
+
+/* Win32 defines this */       
+#undef ERROR
+
+enum NoteType {
+       PROGRESS,
+       ERROR,
+       NOTE
 };
 
 /** @class Color