Try to fix MinGW build.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 1102f16b56bbaea6a30c078ed5619e117e2e4b5d..4f2048b43c04876f32ff1b4dd45d793fe8d5d931 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -40,10 +40,15 @@
 
 #include <libcxml/cxml.h>
 #include <asdcp/KLV.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/function.hpp>
 #include <string>
 
+
+/* MinGW seems to define this, but we want to use it */
+#undef ERROR
+
+
 namespace xmlpp {
        class Element;
 }
@@ -76,10 +81,9 @@ struct Size
 
 extern bool operator== (Size const & a, Size const & b);
 extern bool operator!= (Size const & a, Size const & b);
-extern std::ostream& operator<< (std::ostream& s, Size const & a);
 
 /** Identifier for a sound channel */
-enum Channel {
+enum class Channel {
        LEFT = 0,      ///< left
        RIGHT = 1,     ///< right
        CENTRE = 2,    ///< centre
@@ -101,7 +105,7 @@ enum Channel {
 std::vector<dcp::Channel> used_audio_channels ();
 
 
-enum MCASoundField
+enum class MCASoundField
 {
        FIVE_POINT_ONE,
        SEVEN_POINT_ONE
@@ -114,7 +118,7 @@ extern std::string channel_to_mca_name (Channel c, MCASoundField field);
 extern ASDCP::UL channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dictionary const* dict);
 
 
-enum ContentKind
+enum class ContentKind
 {
        FEATURE,
        SHORT,
@@ -133,7 +137,7 @@ enum ContentKind
 extern std::string content_kind_to_string (ContentKind kind);
 extern ContentKind content_kind_from_string (std::string kind);
 
-enum Effect
+enum class Effect
 {
        NONE,
        BORDER,
@@ -143,42 +147,42 @@ enum Effect
 extern std::string effect_to_string (Effect e);
 extern Effect string_to_effect (std::string s);
 
-enum HAlign
+enum class HAlign
 {
-       HALIGN_LEFT,   ///< horizontal position is distance from left of screen to left of subtitle
-       HALIGN_CENTER, ///< horizontal position is distance from centre of screen to centre of subtitle
-       HALIGN_RIGHT,  ///< horizontal position is distance from right of screen to right of subtitle
+       LEFT,   ///< horizontal position is distance from left of screen to left of subtitle
+       CENTER, ///< horizontal position is distance from centre of screen to centre of subtitle
+       RIGHT,  ///< horizontal position is distance from right of screen to right of subtitle
 };
 
 extern std::string halign_to_string (HAlign a);
 extern HAlign string_to_halign (std::string s);
 
-enum VAlign
+enum class VAlign
 {
-       VALIGN_TOP,    ///< vertical position is distance from top of screen to top of subtitle
-       VALIGN_CENTER, ///< vertical position is distance from centre of screen to centre of subtitle
-       VALIGN_BOTTOM  ///< vertical position is distance from bottom of screen to bottom of subtitle
+       TOP,    ///< vertical position is distance from top of screen to top of subtitle
+       CENTER, ///< vertical position is distance from centre of screen to centre of subtitle
+       BOTTOM  ///< vertical position is distance from bottom of screen to bottom of subtitle
 };
 
 extern std::string valign_to_string (VAlign a);
 extern VAlign string_to_valign (std::string s);
 
 /** Direction for subtitle test */
-enum Direction
+enum class Direction
 {
-       DIRECTION_LTR, ///< left-to-right
-       DIRECTION_RTL, ///< right-to-left
-       DIRECTION_TTB, ///< top-to-bottom
-       DIRECTION_BTT  ///< bottom-to-top
+       LTR, ///< left-to-right
+       RTL, ///< right-to-left
+       TTB, ///< top-to-bottom
+       BTT  ///< bottom-to-top
 };
 
 extern std::string direction_to_string (Direction a);
 extern Direction string_to_direction (std::string s);
 
-enum Eye
+enum class Eye
 {
-       EYE_LEFT,
-       EYE_RIGHT
+       LEFT,
+       RIGHT
 };
 
 /** @class Fraction
@@ -208,7 +212,6 @@ public:
 
 extern bool operator== (Fraction const & a, Fraction const & b);
 extern bool operator!= (Fraction const & a, Fraction const & b);
-extern std::ostream& operator<< (std::ostream& s, Fraction const & f);
 
 /** @struct EqualityOptions
  *  @brief  A class to describe what "equality" means for a particular test.
@@ -254,21 +257,21 @@ struct EqualityOptions
        bool export_differing_subtitles;
 };
 
-/* I've been unable to make mingw happy with ERROR as a symbol, so
-   I'm using a DCP_ prefix here.
-*/
-enum NoteType {
-       DCP_PROGRESS,
-       DCP_ERROR,
-       DCP_NOTE
+
+enum class NoteType {
+       PROGRESS,
+       ERROR,
+       NOTE
 };
 
-enum Standard {
+
+enum class Standard {
        INTEROP,
        SMPTE
 };
 
-enum Formulation {
+
+enum class Formulation {
        MODIFIED_TRANSITIONAL_1,
        MULTIPLE_MODIFIED_TRANSITIONAL_1,
        DCI_ANY,
@@ -297,7 +300,6 @@ public:
 
 extern bool operator== (Colour const & a, Colour const & b);
 extern bool operator!= (Colour const & a, Colour const & b);
-extern std::ostream & operator<< (std::ostream & s, Colour const & c);
 
 typedef boost::function<void (NoteType, std::string)> NoteHandler;
 
@@ -311,7 +313,7 @@ const float ASPECT_ADJUST_EPSILON = 1e-3;
  */
 const float ALIGN_EPSILON = 1e-3;
 
-enum Marker {
+enum class Marker {
        FFOC, ///< first frame of composition
        LFOC, ///< last frame of composition
        FFTC, ///< first frame of title credits
@@ -346,10 +348,9 @@ public:
 };
 
 extern bool operator== (Rating const & a, Rating const & b);
-extern std::ostream& operator<< (std::ostream& s, Rating const & r);
 
 
-enum Status
+enum class Status
 {
        FINAL, ///< final version
        TEMP,  ///< temporary version (picture/sound unfinished)
@@ -385,7 +386,7 @@ public:
 class Luminance
 {
 public:
-       enum Unit {
+       enum class Unit {
                CANDELA_PER_SQUARE_METRE,
                FOOT_LAMBERT
        };