Reword again: Text -> Caption and Plain -> Text.

[dcpomatic.git] / src / lib / reel_writer.cc

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 197773a20832f43820710065c190d2ff87966f91..77d5833533373334d91507bf5db5e112442ca85d 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -528,8 +528,10 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio)
 }
 
 void
-ReelWriter::write (PlayerSubtitles subs, DCPTimePeriod period)
+ReelWriter::write (PlayerCaption subs, TextType type, DCPTimePeriod period)
 {
+       /* XXX: we need separate libdcp asset types here and to know how different they are */
+
        if (!_subtitle_asset) {
                string lang = _film->subtitle_language ();
                if (lang.empty ()) {
@@ -556,7 +558,7 @@ ReelWriter::write (PlayerSubtitles subs, DCPTimePeriod period)
                }
        }
 
-       BOOST_FOREACH (SubtitleString i, subs.text) {
+       BOOST_FOREACH (TextCaption 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));