projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing FFmpeg include; fixes #989.
[dcpomatic.git]
/
src
/
lib
/
text_subtitle_content.cc
diff --git
a/src/lib/text_subtitle_content.cc
b/src/lib/text_subtitle_content.cc
index 37ad5649aec353faa2a37070b71c5519a0dddfe2..08722a065d0f66bdfdce8e907cf0c4603b4075fa 100644
(file)
--- a/
src/lib/text_subtitle_content.cc
+++ b/
src/lib/text_subtitle_content.cc
@@
-23,8
+23,8
@@
#include "text_subtitle.h"
#include "film.h"
#include "font.h"
#include "text_subtitle.h"
#include "film.h"
#include "font.h"
-#include "raw_convert.h"
#include "subtitle_content.h"
#include "subtitle_content.h"
+#include <dcp/raw_convert.h>
#include <libxml++/libxml++.h>
#include <iostream>
#include <libxml++/libxml++.h>
#include <iostream>
@@
-33,8
+33,7
@@
using std::string;
using std::cout;
using boost::shared_ptr;
using std::string;
using std::cout;
using boost::shared_ptr;
-
-std::string const TextSubtitleContent::font_id = "font";
+using dcp::raw_convert;
TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
@@
-60,7
+59,7
@@
TextSubtitleContent::examine (boost::shared_ptr<Job> job)
boost::mutex::scoped_lock lm (_mutex);
_length = s.length ();
boost::mutex::scoped_lock lm (_mutex);
_length = s.length ();
- subtitle->add_font (shared_ptr<Font> (new Font (
font_id
)));
+ subtitle->add_font (shared_ptr<Font> (new Font (
TEXT_FONT_ID
)));
}
string
}
string
@@
-76,10
+75,10
@@
TextSubtitleContent::technical_summary () const
}
void
}
void
-TextSubtitleContent::as_xml (xmlpp::Node* node) const
+TextSubtitleContent::as_xml (xmlpp::Node* node
, bool with_paths
) const
{
node->add_child("Type")->add_child_text ("TextSubtitle");
{
node->add_child("Type")->add_child_text ("TextSubtitle");
- Content::as_xml (node);
+ Content::as_xml (node
, with_paths
);
if (subtitle) {
subtitle->as_xml (node);
if (subtitle) {
subtitle->as_xml (node);