Rationalise #undef-ing of ERROR.

[libdcp.git] / src / subtitle_image.h

diff --git a/src/subtitle_image.h b/src/subtitle_image.h
index e397fb2b1e4127f4827e37702d2ac84fc86bce7a..ae733fe499e1ac2c4a4d7ea9d39f597388783fe3 100644 (file)
--- a/src/subtitle_image.h
+++ b/src/subtitle_image.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,25 +31,28 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/subtitle_image.h
- *  @brief SubtitleImage class.
+ *  @brief SubtitleImage class
  */
 
+
 #ifndef LIBDCP_SUBTITLE_IMAGE_H
 #define LIBDCP_SUBTITLE_IMAGE_H
 
 
 #include "array_data.h"
-#include "types.h"
 #include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>
 #include <string>
 
+
 namespace dcp {
 
+
 /** @class SubtitleImage
- *  @brief A bitmap subtitle with all the associated attributes.
+ *  @brief A bitmap subtitle with all the associated attributes
  */
 class SubtitleImage : public Subtitle
 {
@@ -62,6 +65,7 @@ public:
                HAlign h_align,
                float v_position,
                VAlign v_align,
+               float z_position,
                Time fade_up_time,
                Time fade_down_time
                );
@@ -75,6 +79,7 @@ public:
                HAlign h_align,
                float v_position,
                VAlign v_align,
+               float z_position,
                Time fade_up_time,
                Time fade_down_time
                );
@@ -99,7 +104,7 @@ public:
                return _file;
        }
 
-       bool equals (boost::shared_ptr<dcp::SubtitleImage> other, EqualityOptions options, NoteHandler note);
+       bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions const& options, NoteHandler note) const override;
 
 private:
        ArrayData _png_image;
@@ -107,10 +112,13 @@ private:
        mutable boost::optional<boost::filesystem::path> _file;
 };
 
+
 bool operator== (SubtitleImage const & a, SubtitleImage const & b);
 bool operator!= (SubtitleImage const & a, SubtitleImage const & b);
 std::ostream& operator<< (std::ostream& s, SubtitleImage const & sub);
 
+
 }
 
+
 #endif