projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename a variable.
[dcpomatic.git]
/
src
/
lib
/
isdcf_metadata.cc
diff --git
a/src/lib/isdcf_metadata.cc
b/src/lib/isdcf_metadata.cc
index a6461727e3dd10a5fb8b362cd4819fa495442194..c333325a126f52b1b8321ecf83809d70b2e93827 100644
(file)
--- a/
src/lib/isdcf_metadata.cc
+++ b/
src/lib/isdcf_metadata.cc
@@
-1,24
+1,25
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
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/>.
*/
#include "isdcf_metadata.h"
*/
#include "isdcf_metadata.h"
-#include
"raw_convert.h"
+#include
<dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <iostream>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <iostream>
@@
-27,11
+28,12
@@
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
+using dcp::raw_convert;
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
: content_version (node->number_child<int> ("ContentVersion"))
, audio_language (node->string_child ("AudioLanguage"))
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
: content_version (node->number_child<int> ("ContentVersion"))
, audio_language (node->string_child ("AudioLanguage"))
- , subtitle_language (node->
string_child
("SubtitleLanguage"))
+ , subtitle_language (node->
optional_string_child
("SubtitleLanguage"))
, territory (node->string_child ("Territory"))
, rating (node->string_child ("Rating"))
, studio (node->string_child ("Studio"))
, territory (node->string_child ("Territory"))
, rating (node->string_child ("Rating"))
, studio (node->string_child ("Studio"))
@@
-51,8
+53,10
@@
void
ISDCFMetadata::as_xml (xmlpp::Node* root) const
{
root->add_child("ContentVersion")->add_child_text (raw_convert<string> (content_version));
ISDCFMetadata::as_xml (xmlpp::Node* root) const
{
root->add_child("ContentVersion")->add_child_text (raw_convert<string> (content_version));
+ if (subtitle_language) {
+ root->add_child("SubtitleLanguage")->add_child_text (*subtitle_language);
+ }
root->add_child("AudioLanguage")->add_child_text (audio_language);
root->add_child("AudioLanguage")->add_child_text (audio_language);
- root->add_child("SubtitleLanguage")->add_child_text (subtitle_language);
root->add_child("Territory")->add_child_text (territory);
root->add_child("Rating")->add_child_text (rating);
root->add_child("Studio")->add_child_text (studio);
root->add_child("Territory")->add_child_text (territory);
root->add_child("Rating")->add_child_text (rating);
root->add_child("Studio")->add_child_text (studio);
@@
-69,8
+73,8
@@
bool
operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
{
return a.content_version == b.content_version &&
operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
{
return a.content_version == b.content_version &&
+ a.subtitle_language == b.subtitle_language &&
a.audio_language == b.audio_language &&
a.audio_language == b.audio_language &&
- a.subtitle_language == b.subtitle_language &&
a.territory == b.territory &&
a.rating == b.rating &&
a.studio == b.studio &&
a.territory == b.territory &&
a.rating == b.rating &&
a.studio == b.studio &&