#include "subrip_reader.h"
#include "exceptions.h"
#include "util.h"
+#include <locked_sstream.h>
#include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
using std::list;
using std::cout;
using std::hex;
-using std::stringstream;
using boost::lexical_cast;
using boost::to_upper;
using boost::optional;
/** @param s Subtitle string encoded in UTF-8 */
SubripReader::SubripReader (string const & s)
{
- stringstream str (s);
+ locked_stringstream str (s);
this->read (boost::bind (&get_line_stringstream, &str));
}
CONTENT
} state = COUNTER;
- Time from;
- Time to;
+ RawSubtitle rs;
- string line;
- int line_number = 0;
+ /* This reader extracts no information about where the subtitle
+ should be on screen, so its reference is TOP_OF_SUBTITLE.
+ */
+ rs.vertical_position.line = 0;
+ rs.vertical_position.reference = TOP_OF_SUBTITLE;
while (true) {
optional<string> line = get_line ();
}
trim_right_if (*line, boost::is_any_of ("\n\r"));
+ remove_unicode_bom (line);
- if (
- line->length() >= 3 &&
- static_cast<unsigned char> (line.get()[0]) == 0xef &&
- static_cast<unsigned char> (line.get()[1]) == 0xbb &&
- static_cast<unsigned char> (line.get()[2]) == 0xbf
- ) {
-
- /* Skip Unicode byte order mark */
- line = line->substr (3);
+ /* Keep some history in case there is an error to report */
+ _context.push_back (*line);
+ if (_context.size() > 5) {
+ _context.pop_front ();
}
switch (state) {
}
state = METADATA;
+
+ /* Reset stuff that should not persist across separate subtitles */
+ rs.bold = false;
+ rs.italic = false;
+ rs.underline = false;
+ rs.vertical_position.line = 0;
}
break;
case METADATA:
{
vector<string> p;
- boost::algorithm::split (p, *line, boost::algorithm::is_any_of (" "));
+
+ /* Further trim this line, removing spaces from the end */
+ trim_right_if (*line, boost::is_any_of (" "));
+
+ boost::algorithm::split (p, *line, boost::algorithm::is_any_of (" "), boost::token_compress_on);
if (p.size() != 3 && p.size() != 7) {
- throw SubripError (*line, "a time/position line");
+ for (int i = 0; i < 2; ++i) {
+ optional<string> ex = get_line ();
+ if (ex) {
+ _context.push_back (*ex);
+ }
+ }
+ throw SubripError (*line, "a time/position line", _context);
}
- from = convert_time (p[0]);
- to = convert_time (p[2]);
+ rs.from = convert_time (p[0]);
+ rs.to = convert_time (p[2]);
/* XXX: should not ignore coordinate specifications */
case CONTENT:
if (line->empty ()) {
state = COUNTER;
- line_number = 0;
} else {
- convert_line (*line, line_number, from, to);
- line_number++;
+ convert_line (*line, rs);
+ rs.vertical_position.line = rs.vertical_position.line.get() + 1;
}
break;
}
vector<string> a;
boost::algorithm::split (a, t, boost::is_any_of (":"));
if (a.size() != 3) {
- throw SubripError (t, "time in the format h:m:s,ms");
+ throw SubripError (t, "time in the format h:m:s,ms", _context);
}
vector<string> b;
}
void
-SubripReader::convert_line (string t, int line_number, Time from, Time to)
+SubripReader::convert_line (string t, RawSubtitle& p)
{
enum {
TEXT,
string tag;
- RawSubtitle p;
- p.font = "Arial";
- p.font_size.set_points (48);
- p.from = from;
- p.to = to;
- p.vertical_position.line = line_number;
- /* XXX: arbitrary */
- p.vertical_position.lines = 32;
- p.vertical_position.reference = TOP_OF_SUBTITLE;
-
list<Colour> colours;
colours.push_back (Colour (1, 1, 1));
maybe_content (p);
}
+/* Push p into _subs if it has some text, and clear the text out of p */
void
SubripReader::maybe_content (RawSubtitle& p)
{