From: Carl Hetherington Date: Sun, 14 May 2023 21:04:32 +0000 (+0200) Subject: Rename can_reference -> can_reference_anything. X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=0a68adbacaa15ea7bdfbfd1b29a0e59a68903dce;p=dcpomatic.git Rename can_reference -> can_reference_anything. --- diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index f50ae9800..a02efd1c4 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -612,7 +612,7 @@ DCPContent::reel_split_points (shared_ptr film) const } bool -DCPContent::can_reference(shared_ptr film, string& why_not) const +DCPContent::can_reference_anything(shared_ptr film, string& why_not) const { /* We must be using the same standard as the film */ if (_standard) { @@ -702,7 +702,7 @@ DCPContent::can_reference_video (shared_ptr film, string& why_not) c return false; } - return can_reference(film, why_not); + return can_reference_anything(film, why_not); } @@ -741,7 +741,7 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c return true; } - return can_reference(film, why_not); + return can_reference_anything(film, why_not); } @@ -802,7 +802,7 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri why_not = _("it overlaps other text content; remove the other content."); } - return can_reference(film, why_not); + return can_reference_anything(film, why_not); } void diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index c0445899e..ce53da495 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -186,7 +186,7 @@ private: void read_directory (boost::filesystem::path); void read_sub_directory (boost::filesystem::path); std::list reels (std::shared_ptr film) const; - bool can_reference(std::shared_ptr film, std::string& why_not) const; + bool can_reference_anything(std::shared_ptr film, std::string& why_not) const; bool overlaps(std::shared_ptr film, std::function)> part) const; std::string _name;