From 0a5e92450ae992e9ed24026dd60ae351d0a3e60b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 Aug 2018 00:22:51 +0100 Subject: [PATCH] Some subtitle renaming. --- src/lib/active_text.cc | 2 +- src/lib/hints.cc | 4 ++-- src/lib/player.cc | 14 +++++++------- src/lib/player_text.h | 4 ++-- src/lib/reel_writer.cc | 4 ++-- src/wx/closed_captions_dialog.cc | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc index 6e813144c..5f4440728 100644 --- a/src/lib/active_text.cc +++ b/src/lib/active_text.cc @@ -144,7 +144,7 @@ ActiveText::add_to (weak_ptr content, DCPTime to) _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)); } diff --git a/src/lib/hints.cc b/src/lib/hints.cc index 943991d2b..8979b6b4c 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -287,8 +287,8 @@ Hints::text (PlayerText text, TextType type, DCPTimePeriod period) 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) { diff --git a/src/lib/player.cc b/src/lib/player.cc index 408e791cd..68b3365ea 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -745,13 +745,13 @@ Player::open_subtitles_for_frame (DCPTime time) const _active_texts[TEXT_OPEN_SUBTITLE].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_open_subtitles) ) { - /* Image subtitles */ - list c = transform_bitmap_texts (j.image); + /* Bitmap subtitles */ + list 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 s = render_text (j.text, j.fonts, _video_container_size, time, vfr); + /* String subtitles (rendered to an image) */ + if (!j.string.empty ()) { + list s = render_text (j.string, j.fonts, _video_container_size, time, vfr); copy (s.begin(), s.end(), back_inserter (captions)); } } @@ -940,7 +940,7 @@ Player::bitmap_text_start (weak_ptr wp, weak_ptr wc, C 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); @@ -983,7 +983,7 @@ Player::plain_text_start (weak_ptr wp, weak_ptr wc, Co } 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 ()); } diff --git a/src/lib/player_text.h b/src/lib/player_text.h index 5a8799116..3f5066314 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -35,8 +35,8 @@ public: std::list > fonts; /** BitmapTexts, with their rectangles transformed as specified by their content */ - std::list image; - std::list text; + std::list bitmap; + std::list string; }; #endif diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 2561e556a..f9e3471a8 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -573,14 +573,14 @@ ReelWriter::write (PlayerText subs, TextType type, DCPTimePeriod period) } } - 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(new dcp::SubtitleString(i))); } - BOOST_FOREACH (BitmapText i, subs.image) { + BOOST_FOREACH (BitmapText i, subs.bitmap) { _caption_asset[type]->add ( shared_ptr( new dcp::SubtitleImage( diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index ea7db88f0..a504cade9 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -104,7 +104,7 @@ ClosedCaptionsDialog::update (DCPTime time) DCPOMATIC_ASSERT (player); list 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); } } -- 2.30.2