X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=cbfe6fdbe29866302a1ee7218e55c4f4d1ed253b;hp=08c2bf7ec3642a86f687d9d4d24e6f7cbeaa663c;hb=9726a58f44d52d235b027225ddd68c6acf83c733;hpb=d70f755dde2812bf2311e2ce09563af1b5334d03

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 08c2bf7ec..cbfe6fdbe 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -46,6 +46,12 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	_subtitles = asset->subtitles ();
 	_next = _subtitles.begin ();
 
+	if (dynamic_pointer_cast<dcp::InteropSubtitleAsset>(asset)) {
+		_standard = dcp::Standard::INTEROP;
+	} else {
+		_standard = dcp::Standard::SMPTE;
+	}
+
 	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
 	update_position();
 }
@@ -102,7 +108,7 @@ DCPSubtitleDecoder::pass ()
 		}
 	}
 
-	only_text()->emit_plain (p, s);
+	only_text()->emit_plain(p, s, _standard);
 
 	update_position();