Write encryption test all to the right place. Some more XML writes unformatted to...

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 3fcbd58f770928741169ab7ab627ae40989ed223..013c18630847bc02d5c9930466753b906542ecb2 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 parse {
+       class AssetMap;
+}
+
 /** Identifier for a sound channel */
 enum Channel {
        LEFT = 0,      ///< left
@@ -100,15 +105,20 @@ 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,
@@ -136,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