*/
-#include "dcp_subtitle_decoder.h"
#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>
-#include <iostream>
-using std::cout;
+using std::dynamic_pointer_cast;
using std::list;
+using std::make_shared;
+using std::shared_ptr;
using std::string;
using std::vector;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
+using boost::optional;
using namespace dcpomatic;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
: Decoder (film)
{
- auto 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 (make_shared<TextDecoder>(this, content->only_text(), first));
-
- auto fm = c->font_data();
- for (auto const& i: fm) {
- _fonts.push_back (FontData(i.first, i.second));
- }
+ _subtitle_standard = asset->subtitle_standard();
- /* 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();
}
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 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())
+ );
+ }
}