projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More win32 build fixes.
[libdcp.git]
/
src
/
types.h
diff --git
a/src/types.h
b/src/types.h
index f1b5f640908d2bd1a851224f8138bf663be28617..edabb9e233b9c9595e704fb5a7831bd003193bc9 100644
(file)
--- a/
src/types.h
+++ b/
src/types.h
@@
-24,6
+24,8
@@
#ifndef LIBDCP_TYPES_H
#define LIBDCP_TYPES_H
#ifndef LIBDCP_TYPES_H
#define LIBDCP_TYPES_H
+#include <string>
+
namespace libdcp
{
namespace libdcp
{
@@
-98,11
+100,24
@@
struct EqualityOptions {
: max_mean_pixel_error (0)
, max_std_dev_pixel_error (0)
, max_audio_sample_error (0)
: 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;
{}
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
};
/** @class Color