diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-06 01:06:29 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-08 01:29:35 +0200 |
| commit | 3ee71498b4f029ea2120eca608de0d2d5f35aa38 (patch) | |
| tree | 2450b852251c6df8142874bc12bed95a6c7522f9 /src/lib | |
| parent | 0cfbf86e1804ea01e385359f3778f02974b2cc5a (diff) | |
Use the more in-keeping name string_to_video_encoding().
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_content.cc | 3 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_encoding.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_encoding.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 885cbad93..255660b54 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -141,7 +141,7 @@ DCPContent::DCPContent(cxml::ConstNodePtr node, boost::optional<boost::filesyste } if (auto encoding = node->optional_string_child("VideoEncoding")) { - _video_encoding = video_encoding_from_string(*encoding); + _video_encoding = string_to_video_encoding(*encoding); } _three_d = node->optional_bool_child("ThreeD").get_value_or (false); @@ -658,6 +658,7 @@ DCPContent::reel_split_points (shared_ptr<const Film> film) const return s; } + bool DCPContent::can_reference_anything(shared_ptr<const Film> film, string& why_not) const { diff --git a/src/lib/film.cc b/src/lib/film.cc index 5c3b6cee9..5d13713fb 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -614,7 +614,7 @@ Film::read_metadata(optional<boost::filesystem::path> path) _three_d = f.bool_child("ThreeD"); _interop = f.bool_child("Interop"); if (auto encoding = f.optional_string_child("VideoEncoding")) { - _video_encoding = video_encoding_from_string(*encoding); + _video_encoding = string_to_video_encoding(*encoding); } _limit_to_smpte_bv20 = f.optional_bool_child("LimitToSMPTEBv20").get_value_or(false); _key = dcp::Key(f.string_child("Key")); diff --git a/src/lib/video_encoding.cc b/src/lib/video_encoding.cc index de68c6ae9..858f41bee 100644 --- a/src/lib/video_encoding.cc +++ b/src/lib/video_encoding.cc @@ -43,7 +43,7 @@ video_encoding_to_string(VideoEncoding encoding) VideoEncoding -video_encoding_from_string(string const& encoding) +string_to_video_encoding(string const& encoding) { if (encoding == "jpeg2000") { return VideoEncoding::JPEG2000; diff --git a/src/lib/video_encoding.h b/src/lib/video_encoding.h index 7c240f06f..1edae7a9d 100644 --- a/src/lib/video_encoding.h +++ b/src/lib/video_encoding.h @@ -35,7 +35,7 @@ enum class VideoEncoding std::string video_encoding_to_string(VideoEncoding encoding); -VideoEncoding video_encoding_from_string(std::string const& encoding); +VideoEncoding string_to_video_encoding(std::string const& encoding); #endif |