summaryrefslogtreecommitdiff
path: root/src/stl_writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-29 10:34:10 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-29 10:34:10 +0000
commitc8c3db36a4593e396681b4acd5e9d318a28b1648 (patch)
tree7aafc5d61fce1f6971dde96a5e345a1670e115ea /src/stl_writer.cc
parent75aa6e480d998b29205c0eab328697a5d007986b (diff)
Time -> FrameTime.
Diffstat (limited to 'src/stl_writer.cc')
-rw-r--r--src/stl_writer.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/stl_writer.cc b/src/stl_writer.cc
index 36c89e5..977f861 100644
--- a/src/stl_writer.cc
+++ b/src/stl_writer.cc
@@ -35,8 +35,8 @@ STLWriter::STLWriter (list<Subtitle> subtitles, ostream& out)
bool italic = false;
bool underline = false;
int line = 0;
- optional<Time> from;
- optional<Time> to;
+ optional<FrameTime> from;
+ optional<FrameTime> to;
for (list<Subtitle>::const_iterator i = subtitles.begin(); i != subtitles.end(); ++i) {
bool started_new = false;
@@ -66,16 +66,16 @@ STLWriter::STLWriter (list<Subtitle> subtitles, ostream& out)
text += i->text;
- if (from && from.get() == i->from && to && to.get() == i->to && !started_new) {
+ if (from && from.get() == i->frame_from && to && to.get() == i->frame_to && !started_new) {
for (int j = line; j < i->line; ++j) {
out << "|";
}
out << text;
line = i->line;
} else {
- out << "\n" << i->from.timecode() << "," << i->to.timecode() << "," << text;
- from = i->from;
- to = i->to;
+ out << "\n" << i->frame_from.get().timecode() << "," << i->frame_to.get().timecode() << "," << text;
+ from = i->frame_from;
+ to = i->frame_to;
line = 0;
}
}