projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manual tweaks.
[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 e8ac75e36b8eb7cca0818b390d3bc3cf1b50187f..3bae6e88fb572e686c418995759adcc2d698752f 100644
(file)
--- a/
src/lib/dcp_subtitle_content.cc
+++ b/
src/lib/dcp_subtitle_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,71
+20,78
@@
#include "font.h"
#include "dcp_subtitle_content.h"
#include "font.h"
#include "dcp_subtitle_content.h"
-#include "raw_convert.h"
#include "film.h"
#include "film.h"
-#include "subtitle_content.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 <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"
#include "i18n.h"
-using std::
string
;
+using std::
dynamic_pointer_cast
;
using std::list;
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 (
shared_ptr<const Film> film,
boost::filesystem::path path)
- : Content (
film,
path)
+DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
+ : Content (path)
{
{
-
subtitle.reset (new SubtitleContent (this
));
+
text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::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"))
{
- subtitle = SubtitleContent::from_xml (this, node, version);
+ list<string> notes;
+ text = TextContent::from_xml (this, node, version, notes);
}
void
}
void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
+DCPSubtitleContent::examine (shared_ptr<
const Film> film, shared_ptr<
Job> job)
{
{
- Content::examine (job);
-
- shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
-
- /* Default to turning these subtitles on */
- subtitle->set_use (true);
+ Content::examine (film, job);
-
boost::mutex::scoped_lock lm (_mutex
);
+
auto sc = load (path(0)
);
- shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
- if (iop) {
- subtitle->set_language (iop->language ());
- }
- shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+ auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
+ auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
if (smpte) {
if (smpte) {
- subtitle->set_language (smpte->language().get_value_or (""));
set_video_frame_rate (smpte->edit_rate().numerator);
}
set_video_frame_rate (smpte->edit_rate().numerator);
}
- _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+ boost::mutex::scoped_lock lm (_mutex);
+
+ /* Default to turning these subtitles on */
+ only_text()->set_use (true);
+
+ _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
()) {
-
subtitle->add_font (shared_ptr<Font> (new Font (i->id)
));
+
for (auto i: sc->load_font_nodes
()) {
+
only_text()->add_font(make_shared<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
{
@@
-98,13
+105,13
@@
DCPSubtitleContent::technical_summary () const
}
void
}
void
-DCPSubtitleContent::as_xml (xmlpp::Node* node) const
+DCPSubtitleContent::as_xml (xmlpp::Node* node
, bool with_paths
) const
{
node->add_child("Type")->add_child_text ("DCPSubtitle");
{
node->add_child("Type")->add_child_text ("DCPSubtitle");
- Content::as_xml (node);
+ Content::as_xml (node
, with_paths
);
- if (
subtitle
) {
-
subtitle
->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 ()));