Account for split branch in libdcp.

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

diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc
index b41990db5f738dcfc5aad537a96b359861a4948d..ffc6b3fe2e1c8595c470a3ab5d3e262d46e41c36 100644 (file)
--- a/src/lib/analyse_subtitles_job.cc
+++ b/src/lib/analyse_subtitles_job.cc
@@ -115,20 +115,20 @@ AnalyseSubtitlesJob::analyse(PlayerText const& text, TextType type)
 
        /* We can provide dummy values for time and frame rate here as they are only used to calculate fades */
        dcp::Size const frame = _film->frame_size();
-       std::vector<dcp::SubtitleStandard> override_standard;
+       std::vector<dcp::TextStandard> override_standard;
        if (_film->interop()) {
                /* Since the film is Interop there is only one way the vpositions in the subs can be interpreted
                 * (we assume).
                 */
-               override_standard.push_back(dcp::SubtitleStandard::INTEROP);
+               override_standard.push_back(dcp::TextStandard::INTEROP);
        } else {
                /* We're using the great new SMPTE standard, which means there are two different ways that vposition
                 * could be interpreted; we will write SMPTE-2014 standard assets, but if the projection system uses
                 * SMPTE 20{07,10} instead they won't be placed how we intended.  To show the user this, make the
                 * bounding rectangle enclose both possibilities.
                 */
-               override_standard.push_back(dcp::SubtitleStandard::SMPTE_2007);
-               override_standard.push_back(dcp::SubtitleStandard::SMPTE_2014);
+               override_standard.push_back(dcp::TextStandard::SMPTE_2007);
+               override_standard.push_back(dcp::TextStandard::SMPTE_2014);
        }
 
        for (auto standard: override_standard) {