Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / subtitle_string.h

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 472cda60d52b0031f1b59344e065d86a2134c7a0..c274152b3bd992bc835fd4a32376b71a6f766e0a 100644 (file)
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/subtitle_string.h
@@ -25,6 +39,7 @@
 #define LIBDCP_SUBTITLE_STRING_H
 
 #include "types.h"
+#include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>
 #include <string>
@@ -34,13 +49,14 @@ namespace dcp {
 /** @class SubtitleString
  *  @brief A single line of subtitle text with all the associated attributes.
  */
-class SubtitleString
+class SubtitleString : public Subtitle
 {
 public:
        SubtitleString (
                boost::optional<std::string> font,
                bool italic,
                bool bold,
+               bool underline,
                Colour colour,
                int size,
                float aspect_adjust,
@@ -71,42 +87,18 @@ public:
                return _bold;
        }
 
-       Colour colour () const {
-               return _colour;
-       }
-
-       Time in () const {
-               return _in;
+       bool underline () const {
+               return _underline;
        }
 
-       Time out () const {
-               return _out;
+       Colour colour () const {
+               return _colour;
        }
 
        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;
        }
@@ -119,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;
        }
@@ -141,31 +125,28 @@ public:
                return _aspect_adjust;
        }
 
-       void set_in (Time i) {
-               _in = i;
+       void set_size (int s) {
+               _size = s;
        }
 
-       void set_out (Time o) {
-               _out = o;
+       void set_aspect_adjust (float a) {
+               _aspect_adjust = a;
        }
 
-       void set_h_position (float p) {
-               _h_position = p;
+       void set_text (std::string t) {
+               _text = t;
        }
 
-       /** @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_colour (Colour c) {
+               _colour = c;
        }
 
-       void set_size (int s) {
-               _size = s;
+       void set_effect (Effect e) {
+               _effect = e;
        }
 
-       void set_aspect_adjust (float a) {
-               _aspect_adjust = a;
+       void set_effect_colour (Colour c) {
+               _effect_colour = c;
        }
 
 private:
@@ -175,6 +156,8 @@ private:
        bool _italic;
        /** true if the weight is bold, false for normal */
        bool _bold;
+       /** true to enable underlining, false otherwise */
+       bool _underline;
        /** text colour */
        Colour _colour;
        /** Size in points as if the screen height is 11 inches, so a 72pt font
@@ -182,27 +165,14 @@ 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);
+bool operator!= (SubtitleString const & a, SubtitleString const & b);
 std::ostream& operator<< (std::ostream& s, SubtitleString const & sub);
 
 }