projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add swaroop-profile start/stop/pause buttons.
[dcpomatic.git]
/
src
/
lib
/
isdcf_metadata.cc
diff --git
a/src/lib/isdcf_metadata.cc
b/src/lib/isdcf_metadata.cc
index e9d2e313ebdbb326730b46fb7e016abc8c3375a0..1b424c925d90028c11693ccf428265b028cf762f 100644
(file)
--- a/
src/lib/isdcf_metadata.cc
+++ b/
src/lib/isdcf_metadata.cc
@@
-1,26
+1,28
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 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 <iostream>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "isdcf_metadata.h"
#include "isdcf_metadata.h"
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-36,7
+38,6
@@
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
, rating (node->string_child ("Rating"))
, studio (node->string_child ("Studio"))
, facility (node->string_child ("Facility"))
, rating (node->string_child ("Rating"))
, studio (node->string_child ("Studio"))
, facility (node->string_child ("Facility"))
- , package_type (node->string_child ("PackageType"))
/* This stuff was added later */
, temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
, pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
/* This stuff was added later */
, temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
, pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
@@
-45,7
+46,7
@@
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
, two_d_version_of_three_d (node->optional_bool_child ("TwoDVersionOfThreeD").get_value_or (false))
, mastered_luminance (node->optional_string_child ("MasteredLuminance").get_value_or (""))
{
, two_d_version_of_three_d (node->optional_bool_child ("TwoDVersionOfThreeD").get_value_or (false))
, mastered_luminance (node->optional_string_child ("MasteredLuminance").get_value_or (""))
{
-
+
}
void
}
void
@@
-58,7
+59,6
@@
ISDCFMetadata::as_xml (xmlpp::Node* root) const
root->add_child("Rating")->add_child_text (rating);
root->add_child("Studio")->add_child_text (studio);
root->add_child("Facility")->add_child_text (facility);
root->add_child("Rating")->add_child_text (rating);
root->add_child("Studio")->add_child_text (studio);
root->add_child("Facility")->add_child_text (facility);
- root->add_child("PackageType")->add_child_text (package_type);
root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0");
root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0");
root->add_child("RedBand")->add_child_text (red_band ? "1" : "0");
root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0");
root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0");
root->add_child("RedBand")->add_child_text (red_band ? "1" : "0");
@@
-77,7
+77,6
@@
operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
a.rating == b.rating &&
a.studio == b.studio &&
a.facility == b.facility &&
a.rating == b.rating &&
a.studio == b.studio &&
a.facility == b.facility &&
- a.package_type == b.package_type &&
a.temp_version == b.temp_version &&
a.pre_release == b.pre_release &&
a.red_band == b.red_band &&
a.temp_version == b.temp_version &&
a.pre_release == b.pre_release &&
a.red_band == b.red_band &&