#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
+#include "film.h"
#include "font.h"
#include "text_content.h"
+#include "util.h"
#include <dcp/interop_subtitle_asset.h>
#include <dcp/load_font_node.h>
: Decoder (film)
{
/* Load the XML or MXF file */
- auto const c = load (content->path(0));
- c->fix_empty_font_ids ();
- _subtitles = c->subtitles ();
+ 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 (make_shared<TextDecoder>(this, content->only_text(), first));
-
- /* The fonts that are included in content's file; if it's interop there will be none
- * (as the fonts are held in separate assets).
- */
- auto fonts_in_asset = c->font_data();
-
- /* Fonts specified in the TextContent */
- list<shared_ptr<dcpomatic::Font>> fonts_in_content;
- for (auto i: content->text) {
- auto this_fonts = i->fonts();
- std::copy(this_fonts.begin(), this_fonts.end(), std::back_inserter(fonts_in_content));
- }
- fonts_in_content.sort();
- fonts_in_content.unique();
-
- /* Find a font for each <LoadFont> Node */
- for (auto i: c->load_font_nodes()) {
- bool done = false;
- for (auto j: fonts_in_content) {
- if (j->id() == i->id && j->file()) {
- // One was specified in the content
- _fonts.push_back (FontData(i->id, dcp::ArrayData(*j->file())));
- done = true;
- }
- }
- if (!done) {
- if (fonts_in_asset.find(i->id) != fonts_in_asset.end()) {
- // One was included in the subtitle file
- _fonts.push_back (FontData(i->id, fonts_in_asset[i->id]));
- done = true;
- }
- }
- if (!done) {
- // Give up and add a default
- _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
- }
- }
+ _subtitle_standard = asset->subtitle_standard();
+
+ text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+ update_position();
}
while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
++i;
}
+
+ update_position();
}
time of emitting the first.
*/
- list<dcp::SubtitleString> s;
- list<dcp::SubtitleImage> i;
+ vector<dcp::SubtitleString> s;
+ vector<dcp::SubtitleImage> i;
auto const p = content_time_period (*_next);
while (_next != _subtitles.end () && content_time_period (*_next) == p) {
}
}
- only_text()->emit_plain (p, s);
+ only_text()->emit_plain(p, s, _subtitle_standard);
+
+ update_position();
+
return false;
}
}
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
-{
- return _fonts;
-}
-
-
/** @return time of first subtitle, if there is one */
optional<ContentTime>
DCPSubtitleDecoder::first () const
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())
+ );
+ }
+}
+