projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move raw_convert into libdcp.
[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 74e785ff7cc104b8cb7185ed0b4d80070a415ec3..63144766a50cffe172a671ca24b64a9dfe9c9eb6 100644
(file)
--- a/
src/lib/text_subtitle_content.cc
+++ b/
src/lib/text_subtitle_content.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,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>
@@
-32,20
+33,19
@@
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)
{
- subtitle.reset (new SubtitleContent (this
, film
));
+ subtitle.reset (new SubtitleContent (this));
}
TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
: Content (film, node)
, _length (node->number_child<ContentTime::Type> ("Length"))
{
}
TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
: Content (film, node)
, _length (node->number_child<ContentTime::Type> ("Length"))
{
- subtitle = SubtitleContent::from_xml (this,
film,
node, version);
+ subtitle = SubtitleContent::from_xml (this, node, version);
}
void
}
void
@@
-59,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
@@
-79,7
+79,11
@@
TextSubtitleContent::as_xml (xmlpp::Node* node) const
{
node->add_child("Type")->add_child_text ("TextSubtitle");
Content::as_xml (node);
{
node->add_child("Type")->add_child_text ("TextSubtitle");
Content::as_xml (node);
- subtitle->as_xml (node);
+
+ if (subtitle) {
+ subtitle->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 ()));
}