Improve a variable name.

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 1b144f20456bec9e3d928851632f70b958e85314..08c2bf7ec3642a86f687d9d4d24e6f7cbeaa663c 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,49 +18,39 @@
 
 */
 
-#include "dcp_subtitle_decoder.h"
+
 #include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "font.h"
+#include "text_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
-#include <iostream>
 
-using std::cout;
+
+using std::dynamic_pointer_cast;
 using std::list;
-using std::map;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using boost::bind;
+using boost::optional;
 using namespace dcpomatic;
 
+
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
        : Decoder (film)
 {
-       shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
-       c->fix_empty_font_ids ();
-       _subtitles = c->subtitles ();
+       /* Load the XML or MXF file */
+       auto const asset = load (content->path(0));
+       asset->fix_empty_font_ids ();
+       _subtitles = asset->subtitles ();
        _next = _subtitles.begin ();
 
-       ContentTime first;
-       if (_next != _subtitles.end()) {
-               first = content_time_period(*_next).from;
-       }
-       text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
-
-       map<string, dcp::ArrayData> fm = c->font_data();
-       for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
-               _fonts.push_back (FontData(j->first, j->second));
-       }
-
-       /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
-       for (auto i: c->load_font_nodes()) {
-               if (fm.find(i->id) == fm.end()) {
-                       _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
-               }
-       }
+       text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+       update_position();
 }
 
+
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
@@ -71,8 +61,11 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
        while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
                ++i;
        }
+
+       update_position();
 }
 
+
 bool
 DCPSubtitleDecoder::pass ()
 {
@@ -87,9 +80,9 @@ DCPSubtitleDecoder::pass ()
           time of emitting the first.
        */
 
-       list<dcp::SubtitleString> s;
-       list<dcp::SubtitleImage> i;
-       ContentTimePeriod const p = content_time_period (*_next);
+       vector<dcp::SubtitleString> s;
+       vector<dcp::SubtitleImage> i;
+       auto const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
                auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
@@ -110,9 +103,13 @@ DCPSubtitleDecoder::pass ()
        }
 
        only_text()->emit_plain (p, s);
+
+       update_position();
+
        return false;
 }
 
+
 ContentTimePeriod
 DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
 {
@@ -123,9 +120,25 @@ DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) cons
 }
 
 
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
+/** @return time of first subtitle, if there is one */
+optional<ContentTime>
+DCPSubtitleDecoder::first () const
 {
-       return _fonts;
+       if (_subtitles.empty()) {
+               return {};
+       }
+
+       return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
+}
+
+
+void
+DCPSubtitleDecoder::update_position()
+{
+       if (_next != _subtitles.end()) {
+               only_text()->maybe_set_position(
+                       ContentTime::from_seconds((*_next)->in().as_seconds())
+                       );
+       }
 }