diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-23 11:20:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-23 11:20:12 +0100 |
| commit | df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (patch) | |
| tree | 04e6f5917ed3c2e8ea45904ff0235c08d29a6446 /src/lib/reel_writer.cc | |
| parent | 6f146336b73fe720c83cb75ebdf15e9cb9c02973 (diff) | |
More automated renaming.
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Diffstat (limited to 'src/lib/reel_writer.cc')
| -rw-r--r-- | src/lib/reel_writer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 1836b6543..7f5572c36 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -545,7 +545,7 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio) } void -ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) +ReelWriter::write (PlayerText subs, TextType type, DCPTimePeriod period) { if (!_caption_asset[type]) { string lang = _film->subtitle_language (); @@ -573,14 +573,14 @@ ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) } } - BOOST_FOREACH (TextCaption i, subs.text) { + BOOST_FOREACH (StringText i, subs.text) { /* 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 (BitmapCaption i, subs.image) { + BOOST_FOREACH (BitmapText i, subs.image) { _caption_asset[type]->add ( shared_ptr<dcp::Subtitle>( new dcp::SubtitleImage( |