projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop empty Font IDs in imported DCP subtitles making it into the
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_content.cc
diff --git
a/src/lib/dcp_subtitle_content.cc
b/src/lib/dcp_subtitle_content.cc
index 6a7e381534844a9fa4ebd74db40d68d0ec8c999f..63ee19830bb62bb8a16c33477f25fef9b4283113 100644
(file)
--- a/
src/lib/dcp_subtitle_content.cc
+++ b/
src/lib/dcp_subtitle_content.cc
@@
-37,23
+37,23
@@
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using dcp::raw_convert;
using boost::dynamic_pointer_cast;
using dcp::raw_convert;
-DCPSubtitleContent::DCPSubtitleContent (
shared_ptr<const Film> film,
boost::filesystem::path path)
- : Content (
film,
path)
+DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
+ : Content (path)
{
{
-
caption.push_back (shared_ptr<TextContent> (new TextContent (this, CAPTION_OPEN
)));
+
text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_OPEN_SUBTITLE
)));
}
}
-DCPSubtitleContent::DCPSubtitleContent (
shared_ptr<const Film> film,
cxml::ConstNodePtr node, int version)
- : Content (
film,
node)
+DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
+ : Content (node)
, _length (node->number_child<ContentTime::Type> ("Length"))
{
, _length (node->number_child<ContentTime::Type> ("Length"))
{
-
caption
= TextContent::from_xml (this, node, version);
+
text
= TextContent::from_xml (this, node, version);
}
void
}
void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
+DCPSubtitleContent::examine (shared_ptr<
const Film> film, shared_ptr<
Job> job)
{
{
- Content::examine (job);
+ Content::examine (
film,
job);
shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
@@
-66,28
+66,36
@@
DCPSubtitleContent::examine (shared_ptr<Job> job)
boost::mutex::scoped_lock lm (_mutex);
/* Default to turning these subtitles on */
boost::mutex::scoped_lock lm (_mutex);
/* Default to turning these subtitles on */
- only_
caption
()->set_use (true);
+ only_
text
()->set_use (true);
if (iop) {
if (iop) {
- only_
caption
()->set_language (iop->language ());
+ only_
text
()->set_language (iop->language ());
} else if (smpte) {
} else if (smpte) {
- only_
caption
()->set_language (smpte->language().get_value_or (""));
+ only_
text
()->set_language (smpte->language().get_value_or (""));
}
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
}
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+ sc->fix_empty_font_ids ();
+
BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
- only_
caption
()->add_font (shared_ptr<Font> (new Font (i->id)));
+ only_
text
()->add_font (shared_ptr<Font> (new Font (i->id)));
}
}
DCPTime
}
}
DCPTime
-DCPSubtitleContent::full_length () const
+DCPSubtitleContent::full_length (
shared_ptr<const Film> film
) const
{
{
- FrameRateChange const frc (
active_video_frame_rate(), film()->video_frame_rate
());
+ FrameRateChange const frc (
film, shared_from_this
());
return DCPTime (_length, frc);
}
return DCPTime (_length, frc);
}
+DCPTime
+DCPSubtitleContent::approximate_length () const
+{
+ return DCPTime (_length, FrameRateChange());
+}
+
string
DCPSubtitleContent::summary () const
{
string
DCPSubtitleContent::summary () const
{
@@
-106,8
+114,8
@@
DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
node->add_child("Type")->add_child_text ("DCPSubtitle");
Content::as_xml (node, with_paths);
node->add_child("Type")->add_child_text ("DCPSubtitle");
Content::as_xml (node, with_paths);
- if (only_
caption
()) {
- only_
caption
()->as_xml (node);
+ if (only_
text
()) {
+ only_
text
()->as_xml (node);
}
node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
}
node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));