#include "sub_assert.h"
#include "raw_convert.h"
#include "subtitle.h"
+#include <locked_sstream.h>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
-#include <sstream>
#include <iostream>
#include <vector>
using std::string;
-using std::stringstream;
using std::vector;
using std::map;
using std::cout;
/** @param s Subtitle string encoded in UTF-8 */
SSAReader::SSAReader (string const & s)
{
- stringstream str (s);
+ locked_stringstream str (s);
this->read (boost::bind (&get_line_stringstream, &str));
}
, bold (false)
, italic (false)
, underline (false)
+ , horizontal_reference (HORIZONTAL_CENTRE_OF_SCREEN)
, vertical_reference (BOTTOM_OF_SCREEN)
, vertical_margin (0)
{}
, bold (false)
, italic (false)
, underline (false)
+ , horizontal_reference (HORIZONTAL_CENTRE_OF_SCREEN)
, vertical_reference (BOTTOM_OF_SCREEN)
, vertical_margin (0)
{
vector<string> keys;
- split (keys, format_line, is_any_of (","));
+ split (keys, format_line, boost::is_any_of (","));
vector<string> style;
- split (style, style_line, is_any_of (","));
+ split (style, style_line, boost::is_any_of (","));
SUB_ASSERT (!keys.empty());
SUB_ASSERT (!style.empty());
}
} else if (keys[i] == "Alignment") {
/* These values from libass' source code */
+ switch ((raw_convert<int> (style[i]) - 1) % 3) {
+ case 0:
+ horizontal_reference = LEFT_OF_SCREEN;
+ break;
+ case 1:
+ horizontal_reference = HORIZONTAL_CENTRE_OF_SCREEN;
+ break;
+ case 2:
+ horizontal_reference = RIGHT_OF_SCREEN;
+ break;
+ }
switch (raw_convert<int> (style[i]) & 12) {
case 4:
vertical_reference = TOP_OF_SCREEN;
break;
case 8:
- vertical_reference = CENTRE_OF_SCREEN;
+ vertical_reference = VERTICAL_CENTRE_OF_SCREEN;
break;
case 0:
vertical_reference = BOTTOM_OF_SCREEN;
bool italic;
bool underline;
optional<Effect> effect;
+ HorizontalReference horizontal_reference;
VerticalReference vertical_reference;
int vertical_margin;
* @return List of RawSubtitles to represent line with vertical reference TOP_OF_SUBTITLE.
*/
list<RawSubtitle>
-SSAReader::parse_line (RawSubtitle base, string line)
+SSAReader::parse_line (RawSubtitle base, string line, int play_res_x, int play_res_y)
{
enum {
TEXT,
case TOP_OF_SUBTITLE:
/* Nothing to do */
break;
- case CENTRE_OF_SCREEN:
+ case VERTICAL_CENTRE_OF_SCREEN:
current.vertical_position.proportional = current.vertical_position.proportional.get() - ((line_breaks + 1) * line_size) / 2;
break;
case BOTTOM_OF_SCREEN:
} else if (style == "\\an1" || style == "\\an2" || style == "\\an3") {
current.vertical_position.reference = sub::BOTTOM_OF_SCREEN;
} else if (style == "\\an4" || style == "\\an5" || style == "\\an6") {
- current.vertical_position.reference = sub::CENTRE_OF_SCREEN;
+ current.vertical_position.reference = sub::VERTICAL_CENTRE_OF_SCREEN;
} else if (style == "\\an7" || style == "\\an8" || style == "\\an9") {
current.vertical_position.reference = sub::TOP_OF_SCREEN;
+ } else if (boost::starts_with(style, "\\pos")) {
+ vector<string> bits;
+ boost::algorithm::split (bits, style, boost::is_any_of("(,"));
+ SUB_ASSERT (bits.size() == 3);
+ current.horizontal_position.reference = sub::LEFT_OF_SCREEN;
+ current.horizontal_position.proportional = raw_convert<float>(bits[1]) / play_res_x;
+ current.vertical_position.reference = sub::TOP_OF_SCREEN;
+ current.vertical_position.proportional = raw_convert<float>(bits[2]) / play_res_y;
+ } else if (boost::starts_with(style, "\\fs")) {
+ SUB_ASSERT (style.length() > 3);
+ current.font_size.set_points (raw_convert<int>(style.substr(3)));
}
-
style = "";
}
EVENTS
} part = INFO;
+ int play_res_x = 288;
int play_res_y = 288;
map<string, Style> styles;
string style_format_line;
switch (part) {
case INFO:
- if (type == "PlayResY") {
+ if (type == "PlayResX") {
+ play_res_x = raw_convert<int> (body);
+ } else if (type == "PlayResY") {
play_res_y = raw_convert<int> (body);
}
break;
sub.italic = style.italic;
sub.underline = style.underline;
sub.effect = style.effect;
+ sub.horizontal_position.reference = style.horizontal_reference;
sub.vertical_position.reference = style.vertical_reference;
sub.vertical_position.proportional = float(style.vertical_margin) / play_res_y;
} else if (event_format[i] == "MarginV") {
sub.vertical_position.proportional = raw_convert<float>(event[i]) / play_res_y;
} else if (event_format[i] == "Text") {
- BOOST_FOREACH (sub::RawSubtitle j, parse_line (sub, event[i])) {
+ BOOST_FOREACH (sub::RawSubtitle j, parse_line (sub, event[i], play_res_x, play_res_y)) {
_subs.push_back (j);
}
}