It builds again.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 433a910cddf9423ca9d63281f881a2419beaa9dc..85dc836259573dd2d397a1e0dbf74fe55591ad80 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -24,9 +24,16 @@
 #ifndef LIBDCP_TYPES_H
 #define LIBDCP_TYPES_H
 
-namespace libdcp
+#include <string>
+#include <boost/shared_ptr.hpp>
+
+namespace dcp
 {
 
+namespace parse {
+       class AssetMap;
+}
+
 /** Identifier for a sound channel */
 enum Channel {
        LEFT = 0,      ///< left
@@ -98,13 +105,34 @@ struct EqualityOptions {
                : max_mean_pixel_error (0)
                , max_std_dev_pixel_error (0)
                , max_audio_sample_error (0)
+               , cpl_annotation_texts_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_annotation_texts_can_differ;
+       bool mxf_names_can_differ;
+};
+
+/* Win32 defines this */       
+#undef ERROR
+
+enum NoteType {
+       PROGRESS,
+       ERROR,
+       NOTE
+};
+
+enum Standard {
+       INTEROP,
+       SMPTE
 };
 
+/** @class Color
+ *  @brief An RGB color (aka colour).
+ */
 class Color
 {
 public:
@@ -112,9 +140,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;
 };
@@ -123,6 +151,8 @@ extern bool operator== (Color const & a, Color const & b);
 extern bool operator!= (Color const & a, Color const & b);
 extern std::ostream & operator<< (std::ostream & s, Color const & c);
 
+typedef std::pair<std::string, boost::shared_ptr<const parse::AssetMap> > PathAssetMap;
+
 }
 
 #endif