Rename closed_caption_languages() -> closed_text_languages().
authorCarl Hetherington <cth@carlh.net>
Sat, 11 Jan 2025 22:18:39 +0000 (23:18 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 12 Jan 2025 01:06:50 +0000 (02:06 +0100)
Also make it return closed captions as well as closed subtitles.

src/lib/film.cc
src/lib/film.h

index 8f884a8a534b577b1b5538cc6b33ea70582a8ea8..58fb5d9fa97aa33f990b87c1034da041654eb3fd 100644 (file)
@@ -856,12 +856,12 @@ Film::open_text_languages(bool* burnt_in) const
 
 
 vector<dcp::LanguageTag>
-Film::closed_caption_languages() const
+Film::closed_text_languages() const
 {
        vector<dcp::LanguageTag> result;
        for (auto i: content()) {
                for (auto text: i->text) {
-                       if (text->use() && text->type() == TextType::CLOSED_CAPTION && text->dcp_track() && text->dcp_track()->language) {
+                       if (text->use() && is_closed(text->type()) && text->dcp_track() && text->dcp_track()->language) {
                                result.push_back(*text->dcp_track()->language);
                        }
                }
@@ -1013,7 +1013,7 @@ Film::isdcf_name (bool if_created_now) const
 
        bool burnt_in;
        auto sub_langs = open_text_languages(&burnt_in);
-       auto ccap_langs = closed_caption_languages();
+       auto ccap_langs = closed_text_languages();
        if (sub_langs.first && sub_langs.first->language()) {
                auto lang = entry_for_language(*sub_langs.first);
                if (burnt_in) {
index f095023a38c565396d18307e6e7b970b49ad4e69..6f02a96e6ac0693ce84e7f436bbef0a161798f92 100644 (file)
@@ -181,8 +181,8 @@ public:
         *  @return pair containing the main open subtitle/caption language, and additional languages
         */
        std::pair<boost::optional<dcp::LanguageTag>, std::vector<dcp::LanguageTag>> open_text_languages(bool* burnt_in = nullptr) const;
-       /** @return all closed caption languages in the film */
-       std::vector<dcp::LanguageTag> closed_caption_languages() const;
+       /** @return all closed subtitle/caption languages in the film */
+       std::vector<dcp::LanguageTag> closed_text_languages() const;
 
        std::string content_summary (dcpomatic::DCPTimePeriod period) const;