Merge branch 'master' into 1.0

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 4c824080c6727d0e36d162e3af3723ef91234009..021d1ecfff401744c7fe9f2f1a08c981c5467536 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -25,10 +25,15 @@
 #define LIBDCP_TYPES_H
 
 #include <string>
+#include <boost/shared_ptr.hpp>
 
-namespace libdcp
+namespace dcp
 {
 
+namespace parse {
+       class AssetMap;
+}
+
 /** Identifier for a sound channel */
 enum Channel {
        LEFT = 0,      ///< left
@@ -100,16 +105,24 @@ 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
+       ERROR,
+       NOTE
 };
 
 /** @class Color
@@ -133,6 +146,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