projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use release territory from Interop/SMPTE metadata instead of ISDCF metadata dialogue.
[dcpomatic.git]
/
src
/
lib
/
isdcf_metadata.cc
diff --git
a/src/lib/isdcf_metadata.cc
b/src/lib/isdcf_metadata.cc
index 4f157ce70b1166f1dc503ae1696d8c7409f5dd48..daf3a4c4fb6158a92d5522deee297e3eb9c59d6e 100644
(file)
--- a/
src/lib/isdcf_metadata.cc
+++ b/
src/lib/isdcf_metadata.cc
@@
-34,8
+34,7
@@
using std::shared_ptr;
using dcp::raw_convert;
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
using dcp::raw_convert;
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
- : territory (node->string_child ("Territory"))
- , rating (node->string_child ("Rating"))
+ : rating (node->string_child ("Rating"))
, studio (node->string_child ("Studio"))
, facility (node->string_child ("Facility"))
/* This stuff was added later */
, studio (node->string_child ("Studio"))
, facility (node->string_child ("Facility"))
/* This stuff was added later */
@@
-52,7
+51,6
@@
ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
void
ISDCFMetadata::as_xml (xmlpp::Node* root) const
{
void
ISDCFMetadata::as_xml (xmlpp::Node* root) const
{
- 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("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);
@@
-67,8
+65,7
@@
ISDCFMetadata::as_xml (xmlpp::Node* root) const
bool
operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
{
bool
operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
{
- return a.territory == b.territory &&
- a.rating == b.rating &&
+ return a.rating == b.rating &&
a.studio == b.studio &&
a.facility == b.facility &&
a.temp_version == b.temp_version &&
a.studio == b.studio &&
a.facility == b.facility &&
a.temp_version == b.temp_version &&