diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-21 02:01:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-21 02:01:22 +0000 |
| commit | 18bb7f1b92b3f63160cfd1ff75faa5458fbd7df3 (patch) | |
| tree | db73dab82cdb4703f314e21c3ac8f9f8edd5cf25 /src/lib | |
| parent | 4e5c1b91ff04bebc692e52115a741948037dda54 (diff) | |
Revert most of vertical positioning stuff from previous commit.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/subrip_decoder.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc index ed154ebf5..7ec8a1d39 100644 --- a/src/lib/subrip_decoder.cc +++ b/src/lib/subrip_decoder.cc @@ -53,24 +53,11 @@ SubRipDecoder::pass () return true; } + /* XXX: we are ignoring positioning specified in the file */ + list<dcp::SubtitleString> out; for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) { for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) { - - dcp::VAlign va = dcp::TOP; - if (i->vertical_position.reference) { - switch (i->vertical_position.reference.get ()) { - case sub::TOP_OF_SCREEN: - va = dcp::TOP; - break; - case sub::CENTRE_OF_SCREEN: - va = dcp::CENTER; - break; - case sub::BOTTOM_OF_SCREEN: - va = dcp::BOTTOM; - } - } - out.push_back ( dcp::SubtitleString ( SubRipContent::font_id, @@ -80,7 +67,7 @@ SubRipDecoder::pass () dcp::Time (rint (_subtitles[_next].from.metric().get().all_as_milliseconds() / 4)), dcp::Time (rint (_subtitles[_next].to.metric().get().all_as_milliseconds() / 4)), i->vertical_position.line.get() * (1.5 / 22) + 0.8, - va, + dcp::TOP, j->text, dcp::NONE, dcp::Color (255, 255, 255), |