Split up into RawSubtitle and Subtitle, with collect(). Hopefully cleaner.

1 files changed, 78 insertions, 0 deletions

diff --git a/src/raw_subtitle.h b/src/raw_subtitle.h
new file mode 100644
index 0000000..ffdc669
--- /dev/null
+++ b/src/raw_subtitle.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#ifndef LIBSUB_RAW_SUBTITLE_H
+#define LIBSUB_RAW_SUBTITLE_H
+
+#include "frame_time.h"
+#include "metric_time.h"
+#include "colour.h"
+#include "vertical_reference.h"
+#include "effect.h"
+#include "time_pair.h"
+#include "font_size.h"
+#include "vertical_position.h"
+#include <boost/optional.hpp>
+#include <string>
+#include <list>
+
+namespace sub {
+
+class RawSubtitle
+{
+public:
+	RawSubtitle ()
+		: colour (1, 1, 1)
+		, bold (false)
+		, italic (false)
+		, underline (false)
+	{}
+
+	/** Subtitle text in UTF-8 */
+	std::string text;
+	std::string font;
+
+	/** font size */
+	FontSize font_size;
+
+	boost::optional<Effect> effect;
+	boost::optional<Colour> effect_colour;
+	
+	Colour colour;
+	bool bold;      ///< true to use a bold version of font
+	bool italic;    ///< true to use an italic version of font
+	bool underline; ///< true to underline
+
+	/** vertical position of the baseline of the text */
+	VerticalPosition vertical_position;
+
+	/** from time */
+	TimePair from;
+	/** to time */
+	TimePair to;
+	
+	boost::optional<MetricTime> fade_up;
+	boost::optional<MetricTime> fade_down;
+};
+
+bool operator< (RawSubtitle const &, RawSubtitle const &);	
+
+}
+
+#endif