diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-11 00:10:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-28 02:01:22 +0100 |
| commit | 591c89275bfa26c3b2e1b0f1926909fc4bf5b219 (patch) | |
| tree | 75dd0838141b38081bc754f6b88d4c56f7f5b083 /src/lib/film.cc | |
| parent | d0e74dea9d189187d456173702a54a3b3c72aca0 (diff) | |
Normalise XML attribute names to be camelCase (#2241).
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 0bba13e28..871ec76b8 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -416,7 +416,7 @@ Film::metadata (bool with_content_paths) const root->add_child("UserExplicitVideoFrameRate")->add_child_text(_user_explicit_video_frame_rate ? "1" : "0"); for (auto const& marker: _markers) { auto m = root->add_child("Marker"); - m->set_attribute("Type", dcp::marker_to_string(marker.first)); + m->set_attribute("type", dcp::marker_to_string(marker.first)); m->add_child_text(raw_convert<string>(marker.second.get())); } for (auto i: _ratings) { @@ -603,7 +603,11 @@ Film::read_metadata (optional<boost::filesystem::path> path) _user_explicit_video_frame_rate = f.optional_bool_child("UserExplicitVideoFrameRate").get_value_or(false); for (auto i: f.node_children("Marker")) { - _markers[dcp::marker_from_string(i->string_attribute("Type"))] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content())); + auto type = i->optional_string_attribute("Type"); + if (!type) { + type = i->string_attribute("type"); + } + _markers[dcp::marker_from_string(*type)] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content())); } for (auto i: f.node_children("Rating")) { |