Emit subtitles with correct times when they occur at different times within a frame...

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 1a4896fe700f3f09b0eb94f092dd4527def1e814..23b8347676c54b37ea528931ecd72204b058b79a 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -188,12 +188,11 @@ DCPDecoder::pass_subtitles (ContentTime next)
                        true
                        );
 
-               if (!subs.empty ()) {
-                       /* XXX: assuming that all `subs' are at the same time; maybe this is ok */
+               BOOST_FOREACH (dcp::SubtitleString i, subs) {
                        subtitle->emit_text (
                                ContentTimePeriod (
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().in().as_seconds ()),
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().out().as_seconds ())
+                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.in().as_seconds ()),
+                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ())
                                        ),
                                subs
                                );