Use the more in-keeping name string_to_video_encoding().

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 885cbad931652932891b0f6fefdb2df1781120f9..255660b54c8062b64824b7938e741107c680abe4 100644 (file)
--- 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 5c3b6cee9fa57b7accef48bd00eb806a846e50b2..5d13713fbda4ccad739511a24fff97d2c5d3973c 100644 (file)
--- 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 de68c6ae9dccc87fb9a4a783a300fee5ffea2aa5..858f41beec9cfbcb9bd4b1f622ffb16e4cfd6839 100644 (file)
--- 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 7c240f06f68d0996c913a7436152506dfefe7e9c..1edae7a9dfd7ade2ff137cc21ab614eea7ccfaaf 100644 (file)
--- 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