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 3acded369c90e2ec5f9a73aa179ed99a8e4ba28a..013c18630847bc02d5c9930466753b906542ecb2 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -24,17 +24,26 @@
 #ifndef LIBDCP_TYPES_H
 #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
-       RIGHT = 1,   ///< right
-       CENTRE = 2,  ///< centre
-       LFE = 3,     ///< low-frequency effects (sub)
-       LS = 4,      ///< left surround
-       RS = 5       ///< right surround
+       LEFT = 0,      ///< left
+       RIGHT = 1,     ///< right
+       CENTRE = 2,    ///< centre
+       LFE = 3,       ///< low-frequency effects (sub)
+       LS = 4,        ///< left surround
+       RS = 5,        ///< right surround
+       CHANNEL_7 = 6, ///< channel 7; not sure what this should be called
+       CHANNEL_8 = 7  ///< channel 8; not sure what this should be called
 };
 
 enum ContentKind
@@ -58,6 +67,9 @@ enum Effect
        SHADOW
 };
 
+extern std::string effect_to_string (Effect e);
+extern Effect string_to_effect (std::string s);
+
 enum VAlign
 {
        TOP,
@@ -65,6 +77,9 @@ enum VAlign
        BOTTOM
 };
 
+extern std::string valign_to_string (VAlign a);
+extern VAlign string_to_valign (std::string s);
+
 enum Eye
 {
        EYE_LEFT,
@@ -90,13 +105,29 @@ 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,
+       NOTE
+};
+
+/** @class Color
+ *  @brief An RGB color (aka colour).
+ */
 class Color
 {
 public:
@@ -104,14 +135,19 @@ 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;
 };
 
 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