projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error message.
[libdcp.git]
/
src
/
subtitle_asset.cc
diff --git
a/src/subtitle_asset.cc
b/src/subtitle_asset.cc
index 80cc1ea66f0f22dc02ea0fa0d1680606f4ffb77f..866a6d253706401f96746527bf9eec329782ccc0 100644
(file)
--- a/
src/subtitle_asset.cc
+++ b/
src/subtitle_asset.cc
@@
-22,6
+22,7
@@
#include <boost/algorithm/string.hpp>
#include <libxml++/nodes/element.h>
#include "subtitle_asset.h"
#include <boost/algorithm/string.hpp>
#include <libxml++/nodes/element.h>
#include "subtitle_asset.h"
+#include "parse/subtitle.h"
#include "util.h"
#include "xml.h"
#include "util.h"
#include "xml.h"
@@
-55,7
+56,8
@@
SubtitleAsset::SubtitleAsset (string directory, string movie_title, string langu
void
SubtitleAsset::read_xml (string xml_file)
{
void
SubtitleAsset::read_xml (string xml_file)
{
- shared_ptr<cxml::File> xml (new cxml::File (xml_file, "DCSubtitle"));
+ shared_ptr<cxml::Document> xml (new cxml::Document ("DCSubtitle"));
+ xml->read_file (xml_file);
_uuid = xml->string_child ("SubtitleID");
_movie_title = xml->string_child ("MovieTitle");
_uuid = xml->string_child ("SubtitleID");
_movie_title = xml->string_child ("MovieTitle");
@@
-277,7
+279,7
@@
SubtitleAsset::add (shared_ptr<Subtitle> s)
}
void
}
void
-SubtitleAsset::write_to_cpl (xmlpp::
Node* node
) const
+SubtitleAsset::write_to_cpl (xmlpp::
Element* node, bool
) const
{
/* XXX: should EditRate, Duration and IntrinsicDuration be in here? */
{
/* XXX: should EditRate, Duration and IntrinsicDuration be in here? */