X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsubtitle_string.h;h=7e84d1033a067be8033fa2a4cca777e9ac49ccb0;hb=7c2dccaa6cfbda041fd1a10a391aab5b184b6267;hp=20cc1fe3fb0f2716fcfabbc0d06b9ceeed04cc7a;hpb=81fc3762d30576472e2861ce8acb8e6deacfb463;p=libdcp.git diff --git a/src/subtitle_string.h b/src/subtitle_string.h index 20cc1fe3..7e84d103 100644 --- a/src/subtitle_string.h +++ b/src/subtitle_string.h @@ -1,20 +1,34 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + 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 #include @@ -34,12 +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 font, bool italic, + bool bold, + bool underline, Colour colour, int size, float aspect_adjust, @@ -49,6 +66,7 @@ public: HAlign h_align, float v_position, VAlign v_align, + Direction direction, std::string text, Effect effect, Colour effect_colour, @@ -65,39 +83,24 @@ public: return _italic; } - Colour colour () const { - return _colour; + bool bold () const { + return _bold; } - 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 top - * (between 0 and 1) - */ - float v_position () const { - return _v_position; - } - - VAlign v_align () const { - return _v_align; + Direction direction () const { + return _direction; } Effect effect () const { @@ -108,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; } @@ -130,15 +125,8 @@ public: return _aspect_adjust; } - 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_font (std::string id) { + _font = id; } void set_size (int s) { @@ -149,38 +137,46 @@ public: _aspect_adjust = a; } + void set_text (std::string t) { + _text = t; + } + + void set_colour (Colour c) { + _colour = c; + } + + void set_effect (Effect e) { + _effect = e; + } + + void set_effect_colour (Colour c) { + _effect_colour = c; + } + private: /** font ID */ boost::optional _font; /** true if the text is italic */ 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 * would be 1/11th of the screen height. - */ + */ 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); }