Move common parts of text/image subtitle out to a base class.

[libdcp.git] / src / subtitle_string.h

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 47e4fed15593880473817fa6d5c1d25af51a6124..fc88c15b475ae7ba29e10e9b5e59017398c97f9e 100644 (file)
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -39,6 +39,7 @@
 #define LIBDCP_SUBTITLE_STRING_H
 
 #include "types.h"
+#include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>
 #include <string>
@@ -48,7 +49,7 @@ namespace dcp {
 /** @class SubtitleString
  *  @brief A single line of subtitle text with all the associated attributes.
  */
-class SubtitleString
+class SubtitleString : public Subtitle
 {
 public:
        SubtitleString (
@@ -94,38 +95,10 @@ public:
                return _colour;
        }
 
-       Time in () const {
-               return _in;
-       }
-
-       Time out () const {
-               return _out;
-       }
-
        std::string text () const {
                return _text;
        }
 
-       float h_position () const {
-               return _h_position;
-       }
-
-       HAlign h_align () const {
-               return _h_align;
-       }
-
-       /** @return vertical position as a proportion of the screen height from the
-        *  vertical alignment point.
-        *  (between 0 and 1)
-        */
-       float v_position () const {
-               return _v_position;
-       }
-
-       VAlign v_align () const {
-               return _v_align;
-       }
-
        Direction direction () const {
                return _direction;
        }
@@ -138,14 +111,6 @@ public:
                return _effect_colour;
        }
 
-       Time fade_up_time () const {
-               return _fade_up_time;
-       }
-
-       Time fade_down_time () const {
-               return _fade_down_time;
-       }
-
        int size () const {
                return _size;
        }
@@ -160,25 +125,6 @@ public:
                return _aspect_adjust;
        }
 
-       void set_in (Time i) {
-               _in = i;
-       }
-
-       void set_out (Time o) {
-               _out = o;
-       }
-
-       void set_h_position (float p) {
-               _h_position = p;
-       }
-
-       /** @param p New vertical position as a proportion of the screen height
-        *  from the top (between 0 and 1)
-        */
-       void set_v_position (float p) {
-               _v_position = p;
-       }
-
        void set_size (int s) {
                _size = s;
        }
@@ -203,14 +149,6 @@ public:
                _effect_colour = c;
        }
 
-       void set_fade_up_time (dcp::Time t) {
-               _fade_up_time = t;
-       }
-
-       void set_fade_down_time (dcp::Time t) {
-               _fade_down_time = t;
-       }
-
 private:
        /** font ID */
        boost::optional<std::string> _font;
@@ -227,24 +165,10 @@ private:
         */
        int _size;
        float _aspect_adjust;
-       Time _in;
-       Time _out;
-       /** Horizontal position as a proportion of the screen width from the _h_align
-        *  (between 0 and 1)
-        */
-       float _h_position;
-       HAlign _h_align;
-       /** Vertical position as a proportion of the screen height from the _v_align
-        *  (between 0 and 1)
-        */
-       float _v_position;
-       VAlign _v_align;
        Direction _direction;
        std::string _text;
        Effect _effect;
        Colour _effect_colour;
-       Time _fade_up_time;
-       Time _fade_down_time;
 };
 
 bool operator== (SubtitleString const & a, SubtitleString const & b);