diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpl.cc | 2 | ||||
| -rw-r--r-- | src/cpl.h | 4 | ||||
| -rw-r--r-- | src/language_tag.cc | 10 | ||||
| -rw-r--r-- | src/language_tag.h | 4 | ||||
| -rw-r--r-- | src/reel_text_asset.cc | 2 | ||||
| -rw-r--r-- | src/smpte_text_asset.h | 2 | ||||
| -rw-r--r-- | src/sound_asset.cc | 2 |
7 files changed, 13 insertions, 13 deletions
@@ -807,7 +807,7 @@ CPL::set_additional_subtitle_languages(vector<dcp::LanguageTag> const& langs) { _additional_subtitle_languages.clear(); for (auto const& i: langs) { - _additional_subtitle_languages.push_back(i.to_string()); + _additional_subtitle_languages.push_back(i.as_string()); } } @@ -224,7 +224,7 @@ public: } void set_full_content_title_text_language(dcp::LanguageTag l) { - _full_content_title_text_language = l.to_string(); + _full_content_title_text_language = l.as_string(); } boost::optional<std::string> release_territory() const { @@ -324,7 +324,7 @@ public: void set_additional_subtitle_languages(std::vector<dcp::LanguageTag> const& lang); void set_sign_language_video_language(dcp::LanguageTag lang) { - _sign_language_video_language = lang.to_string(); + _sign_language_video_language = lang.as_string(); } boost::optional<std::string> sign_language_video_language() const { diff --git a/src/language_tag.cc b/src/language_tag.cc index 037814f9..227620be 100644 --- a/src/language_tag.cc +++ b/src/language_tag.cc @@ -149,7 +149,7 @@ LanguageTag::LanguageTag (string tag) string -LanguageTag::to_string () const +LanguageTag::as_string() const { if (!_language) { throw LanguageTagError("No language set up"); @@ -336,28 +336,28 @@ LanguageTag::subtag_type_name (SubtagType type) bool dcp::operator== (dcp::LanguageTag const& a, dcp::LanguageTag const& b) { - return a.to_string() == b.to_string(); + return a.as_string() == b.as_string(); } bool dcp::operator!= (dcp::LanguageTag const& a, dcp::LanguageTag const& b) { - return a.to_string() != b.to_string(); + return a.as_string() != b.as_string(); } bool dcp::operator< (dcp::LanguageTag const& a, dcp::LanguageTag const& b) { - return a.to_string() < b.to_string(); + return a.as_string() < b.as_string(); } ostream& dcp::operator<< (ostream& os, dcp::LanguageTag const& tag) { - os << tag.to_string(); + os << tag.as_string(); return os; } diff --git a/src/language_tag.h b/src/language_tag.h index 3232dda9..d3eba28b 100644 --- a/src/language_tag.h +++ b/src/language_tag.h @@ -53,8 +53,8 @@ namespace dcp { class LanguageTag { public: - std::string to_string () const; - std::string description () const; + std::string as_string() const; + std::string description() const; struct SubtagData { diff --git a/src/reel_text_asset.cc b/src/reel_text_asset.cc index 248a2ab3..31cbdacd 100644 --- a/src/reel_text_asset.cc +++ b/src/reel_text_asset.cc @@ -86,7 +86,7 @@ ReelTextAsset::ReelTextAsset(std::shared_ptr<const cxml::Node> node) void ReelTextAsset::set_language(dcp::LanguageTag language) { - _language = language.to_string(); + _language = language.as_string(); } diff --git a/src/smpte_text_asset.h b/src/smpte_text_asset.h index 24665d3a..6a08ffe4 100644 --- a/src/smpte_text_asset.h +++ b/src/smpte_text_asset.h @@ -104,7 +104,7 @@ public: } void set_language (dcp::LanguageTag l) { - _language = l.to_string(); + _language = l.as_string(); } void set_issue_date (LocalTime t) { diff --git a/src/sound_asset.cc b/src/sound_asset.cc index c73255b8..f671a58a 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -127,7 +127,7 @@ SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Lan , _edit_rate (edit_rate) , _channels (channels) , _sampling_rate (sampling_rate) - , _language (language.to_string()) + , _language(language.as_string()) { } |