_data[content].back().to = to;
- BOOST_FOREACH (StringText& i, _data[content].back().subs.text) {
+ BOOST_FOREACH (StringText& i, _data[content].back().subs.string) {
i.set_out (dcp::Time(to.seconds(), 1000));
}
return;
}
- int lines = text.text.size();
- BOOST_FOREACH (StringText i, text.text) {
+ int lines = text.string.size();
+ BOOST_FOREACH (StringText i, text.string) {
if (i.text().length() > CLOSED_CAPTION_LENGTH) {
++lines;
if (!_long_ccap) {
_active_texts[TEXT_OPEN_SUBTITLE].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_open_subtitles)
) {
- /* Image subtitles */
- list<PositionImage> c = transform_bitmap_texts (j.image);
+ /* Bitmap subtitles */
+ list<PositionImage> c = transform_bitmap_texts (j.bitmap);
copy (c.begin(), c.end(), back_inserter (captions));
- /* Text subtitles (rendered to an image) */
- if (!j.text.empty ()) {
- list<PositionImage> s = render_text (j.text, j.fonts, _video_container_size, time, vfr);
+ /* String subtitles (rendered to an image) */
+ if (!j.string.empty ()) {
+ list<PositionImage> s = render_text (j.string, j.fonts, _video_container_size, time, vfr);
copy (s.begin(), s.end(), back_inserter (captions));
}
}
subtitle.sub.rectangle.height *= text->y_scale ();
PlayerText ps;
- ps.image.push_back (subtitle.sub);
+ ps.bitmap.push_back (subtitle.sub);
DCPTime from (content_time_to_dcp (piece, subtitle.from()));
_active_texts[subtitle.type()].add_from (wc, ps, from);
}
s.set_in (dcp::Time(from.seconds(), 1000));
- ps.text.push_back (StringText (s, text->outline_width()));
+ ps.string.push_back (StringText (s, text->outline_width()));
ps.add_fonts (text->fonts ());
}
std::list<boost::shared_ptr<Font> > fonts;
/** BitmapTexts, with their rectangles transformed as specified by their content */
- std::list<BitmapText> image;
- std::list<StringText> text;
+ std::list<BitmapText> bitmap;
+ std::list<StringText> string;
};
#endif
}
}
- BOOST_FOREACH (StringText i, subs.text) {
+ BOOST_FOREACH (StringText i, subs.string) {
/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
i.set_in (i.in() - dcp::Time (_period.from.seconds(), i.in().tcr));
i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
_caption_asset[type]->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
}
- BOOST_FOREACH (BitmapText i, subs.image) {
+ BOOST_FOREACH (BitmapText i, subs.bitmap) {
_caption_asset[type]->add (
shared_ptr<dcp::Subtitle>(
new dcp::SubtitleImage(
DCPOMATIC_ASSERT (player);
list<StringText> to_show;
BOOST_FOREACH (PlayerText i, player->closed_captions_for_frame(time)) {
- BOOST_FOREACH (StringText j, i.text) {
+ BOOST_FOREACH (StringText j, i.string) {
to_show.push_back (j);
}
}