Cleanup: extract HAlign to its own files.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 340d86133524cae4896ee853ebf135405d5e60be..bcb6da5b91cbd567f94e61c4290f95d08678487d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -69,10 +69,7 @@ namespace dcp
  */
 struct Size
 {
-       Size ()
-               : width (0)
-               , height (0)
-       {}
+       Size() = default;
 
        Size (int w, int h)
                : width (w)
@@ -83,8 +80,8 @@ struct Size
                return float (width) / height;
        }
 
-       int width;
-       int height;
+       int width = 0;
+       int height = 0;
 };
 
 
@@ -142,42 +139,6 @@ extern std::string effect_to_string (Effect e);
 extern Effect string_to_effect (std::string s);
 
 
-enum class HAlign
-{
-       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 class VAlign
-{
-       /** vertical position is distance:
-        *    from top of screen to top of subtitle (for SMPTE 428-7:{2007,2010} or
-        *    from top of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
-        */
-       TOP,
-       /** vertical position is distance:
-        *    from centre of screen to centre of subtitle (for SMPTE 428-7:{2007,2010}) or
-        *    from centre of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
-        */
-       CENTER,
-       /** vertical position is distance:
-        *    from bottom of screen to bottom of subtitle (for SMPTE 428-7:{2007,2010}) or
-        *    from bottom of screen to subtitle baseline (for Interop or SMPTE 428-7:2014)
-        */
-       BOTTOM
-};
-
-
-extern std::string valign_to_string (VAlign a);
-extern VAlign string_to_valign (std::string s);
-
-
 /** Direction for subtitle test */
 enum class Direction
 {
@@ -206,7 +167,8 @@ class Fraction
 {
 public:
        /** Construct a fraction of 0/0 */
-       Fraction () {}
+       Fraction() = default;
+
        explicit Fraction (std::string s);
        /** Construct a fraction with a specified numerator and denominator.
         *  @param n Numerator.
@@ -261,7 +223,7 @@ class Colour
 {
 public:
        /** Construct a Colour, initialising it to black */
-       Colour ();
+       Colour() = default;
 
        /** Construct a Colour from R, G and B.  The values run between
         *  0 and 255.