Merge.

[dcpomatic.git] / src / lib / isdcf_metadata.cc

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 7d960b6ac758538d0728b68501a803e0368dcc7d..e9d2e313ebdbb326730b46fb7e016abc8c3375a0 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -29,23 +29,23 @@ 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");
-       subtitle_language = node->string_child ("SubtitleLanguage");
-       territory = node->string_child ("Territory");
-       rating = node->string_child ("Rating");
-       studio = node->string_child ("Studio");
-       facility = node->string_child ("Facility");
-       package_type = node->string_child ("PackageType");
-
+       : content_version (node->number_child<int> ("ContentVersion"))
+       , audio_language (node->string_child ("AudioLanguage"))
+       , subtitle_language (node->string_child ("SubtitleLanguage"))
+       , territory (node->string_child ("Territory"))
+       , 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);
-       red_band = node->optional_bool_child ("RedBand").get_value_or (false);
-       chain = node->optional_string_child ("Chain").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 ("");
+       , temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
+       , pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
+       , red_band (node->optional_bool_child ("RedBand").get_value_or (false))
+       , chain (node->optional_string_child ("Chain").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
@@ -67,22 +67,21 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
        root->add_child("MasteredLuminance")->add_child_text (mastered_luminance);
 }
 
-void
-ISDCFMetadata::read_old_metadata (string k, string v)
+bool
+operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
 {
-       if (k == N_("audio_language")) {
-               audio_language = v;
-       } else if (k == N_("subtitle_language")) {
-               subtitle_language = v;
-       } else if (k == N_("territory")) {
-               territory = v;
-       } else if (k == N_("rating")) {
-               rating = v;
-       } else if (k == N_("studio")) {
-               studio = v;
-       } else if (k == N_("facility")) {
-               facility = v;
-       } else if (k == N_("package_type")) {
-               package_type = v;
-       }
-}      
+       return a.content_version == b.content_version &&
+               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.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.chain == b.chain &&
+               a.two_d_version_of_three_d == b.two_d_version_of_three_d &&
+               a.mastered_luminance == b.mastered_luminance;
+}