pot/merge.

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

diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index 43c68bc2218e6e34b642aabff6d87543a78c6ae4..2daa5086dda6c2a529c4420f4fb8c5f0525be99e 100644 (file)
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -63,7 +63,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
                        filename = filename.string() + String::compose(_("_reel%1"), i + 1);
                }
 
-               _assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), filename));
+               _assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, ".xml")));
        }
 
        BOOST_FOREACH (dcpomatic::DCPTimePeriod i, film->reels()) {
@@ -84,10 +84,25 @@ SubtitleEncoder::go ()
 
        while (!_player->pass()) {}
 
+       int reel = 0;
        for (vector<pair<shared_ptr<dcp::SubtitleAsset>, boost::filesystem::path> >::iterator i = _assets.begin(); i != _assets.end(); ++i) {
-               if (i->first) {
-                       i->first->write (i->second);
+               if (!i->first) {
+                       /* No subtitles arrived for this asset; make an empty one so we write something to the output */
+                       if (_film->interop()) {
+                               shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset());
+                               s->set_movie_title (_film->name());
+                               s->set_reel_number (raw_convert<string>(reel + 1));
+                               i->first = s;
+                       } else {
+                               shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
+                               s->set_content_title_text (_film->name());
+                               s->set_reel_number (reel + 1);
+                               i->first = s;
+                       }
                }
+
+               i->first->write (i->second);
+               ++reel;
        }
 }