projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscript tweak.
[libdcp.git]
/
src
/
types.h
diff --git
a/src/types.h
b/src/types.h
index 433a910cddf9423ca9d63281f881a2419beaa9dc..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,13
+100,29
@@
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
+ * @brief An RGB color (aka colour).
+ */
class Color
{
public:
class Color
{
public:
@@
-112,9
+130,9
@@
public:
Color (int r_, int g_, int b_);
Color (std::string argb_hex);
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;
};
std::string to_argb_string () const;
};