/*
- Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "font.h"
#include "dcp_subtitle_content.h"
#include "film.h"
+#include "font_id_allocator.h"
#include "text_content.h"
#include <dcp/raw_convert.h>
#include <dcp/interop_subtitle_asset.h>
#include <dcp/smpte_subtitle_asset.h>
#include <dcp/interop_load_font_node.h>
#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
#include "i18n.h"
-using std::string;
+using std::dynamic_pointer_cast;
using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
using dcp::raw_convert;
using namespace dcpomatic;
DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
: Content (path)
{
- text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_OPEN_SUBTITLE)));
+ text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE));
}
DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
: Content (node)
, _length (node->number_child<ContentTime::Type> ("Length"))
{
- text = TextContent::from_xml (this, node, version);
+ list<string> notes;
+ text = TextContent::from_xml (this, node, version, notes);
}
void
{
Content::examine (film, job);
- shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+ auto subtitle_asset = load(path(0));
- shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
- shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+ auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(subtitle_asset);
+ auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(subtitle_asset);
if (smpte) {
- set_video_frame_rate (smpte->edit_rate().numerator);
+ set_video_frame_rate(film, smpte->edit_rate().numerator);
}
boost::mutex::scoped_lock lm (_mutex);
/* Default to turning these subtitles on */
only_text()->set_use (true);
- if (iop) {
- only_text()->set_language (iop->language ());
- } else if (smpte) {
- only_text()->set_language (smpte->language().get_value_or (""));
- }
+ _length = ContentTime::from_seconds(subtitle_asset->latest_subtitle_out().as_seconds());
- _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+ subtitle_asset->fix_empty_font_ids();
+ add_fonts(only_text(), subtitle_asset);
+}
- sc->fix_empty_font_ids ();
- BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
- only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
+void
+DCPSubtitleContent::add_fonts(shared_ptr<TextContent> content, shared_ptr<dcp::SubtitleAsset> subtitle_asset)
+{
+ FontIDAllocator font_id_allocator;
+
+ for (auto node: subtitle_asset->load_font_nodes()) {
+ font_id_allocator.add_font(0, subtitle_asset->id(), node->id);
+ }
+ font_id_allocator.allocate();
+
+ auto font_data = subtitle_asset->font_data();
+ for (auto node: subtitle_asset->load_font_nodes()) {
+ auto data = font_data.find(node->id);
+ shared_ptr<dcpomatic::Font> font;
+ if (data != font_data.end()) {
+ font = make_shared<Font>(
+ font_id_allocator.font_id(0, subtitle_asset->id(), node->id),
+ data->second
+ );
+ } else {
+ font = make_shared<Font>(
+ font_id_allocator.font_id(0, subtitle_asset->id(), node->id)
+ );
+ }
+ content->add_font(font);
+ }
+
+ if (!font_id_allocator.has_default_font()) {
+ content->add_font(make_shared<dcpomatic::Font>(font_id_allocator.default_font_id(), default_font_file()));
}
}
+
DCPTime
DCPSubtitleContent::full_length (shared_ptr<const Film> film) const
{