More consistent error message in a subtitle exception.

[libdcp.git] / src / text_node.h

diff --git a/src/text_node.h b/src/text_node.h
index 1affd83f22e2ff94a4e6bbd6cdf86ff898147803..8624a178cd3db78942e2331e94635f853546ec52 100644 (file)
--- a/src/text_node.h
+++ b/src/text_node.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <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/text.h
@@ -46,14 +60,16 @@ public:
                , h_align (HALIGN_LEFT)
                , v_position (0)
                , v_align (VALIGN_TOP)
+               , direction (DIRECTION_LTR)
        {}
 
-       TextNode (boost::shared_ptr<const cxml::Node> node, int tcr);
+       TextNode (boost::shared_ptr<const cxml::Node> node, int tcr, std::string font_id_attribute);
 
        float h_position;
        HAlign h_align;
        float v_position;
        VAlign v_align;
+       Direction direction;
        std::string text;
        std::list<boost::shared_ptr<FontNode> > font_nodes;
 };