X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=193c9995aee57516e15a6a5143237c352282ef63;hp=62b74be90cb7765db19ad34a2ad51656da271abf;hb=0a5d3c77247d3e68a144bfc077c29fbcf3819735;hpb=34eb57979b5293ac3b864310f8fc8c77c26343e2 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 62b74be90..193c9995a 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -148,7 +148,7 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) auto ck = node->optional_string_child("ContentKind"); if (ck) { - _content_kind = dcp::content_kind_from_string (*ck); + _content_kind = dcp::ContentKind::from_name(*ck); } _cpl = node->optional_string_child("CPL"); for (auto i: node->node_children("ReelLength")) { @@ -388,7 +388,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const } node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); if (_content_kind) { - node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind)); + node->add_child("ContentKind")->add_child_text(_content_kind->name()); } if (_cpl) { node->add_child("CPL")->add_child_text (_cpl.get ());