More renaming.

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

diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc
index 741bbb8bcf9c39a6b74d54cd42ee7dbed6f490c4..168bfa5cc7f12c0948c83c4ca003943aeacde87f 100644 (file)
--- a/src/lib/dcp_text_decoder.cc
+++ b/src/lib/dcp_text_decoder.cc
@@ -63,7 +63,7 @@ DCPTextDecoder::pass ()
 
        /* Gather all subtitles with the same time period that are next
           on the list.  We must emit all subtitles for the same time
-          period with the same text_subtitle() call otherwise the
+          period with the same plain_text() call otherwise the
           TextDecoder will assume there is nothing else at the
           time of emit the first.
        */
@@ -81,12 +81,12 @@ DCPTextDecoder::pass ()
                /* XXX: image subtitles */
        }
 
-       subtitle->emit_text (p, s);
+       subtitle->emit_plain (p, s);
        return false;
 }
 
 ContentTimePeriod
-DCPTextDecoder::content_time_period (shared_ptr<dcp::SubtitleString> s) const
+DCPTextDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
 {
        return ContentTimePeriod (
                ContentTime::from_seconds (s->in().as_seconds ()),