From 27ce8c0300ae289b61291b56a75f3240049e6b8b Mon Sep 17 00:00:00 2001 From: Karl Dietz Date: Thu, 15 Dec 2011 00:56:54 +0100 Subject: [PATCH 2/2] handle more ISO-639 codes renames "qaa" to "original language" (see EN 300 468, DVB-SI) converts codes to lower case (supposedly switch from 14th to 15th edition of ISO 639) --- mythtv/libs/libmythbase/iso639.cpp | 2 +- mythtv/libs/libmythbase/iso639.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmythbase/iso639.cpp b/mythtv/libs/libmythbase/iso639.cpp index 1418a24..3577d80 100644 --- a/mythtv/libs/libmythbase/iso639.cpp +++ b/mythtv/libs/libmythbase/iso639.cpp @@ -516,7 +516,7 @@ static int createCodeToEnglishNamesMap(QMap& names) names[iso639_str3_to_key("pra")] = QString("Prakrit languages"); names[iso639_str3_to_key("pro")] = QString("Old Proven�al (to 1500)"); names[iso639_str3_to_key("pus")] = QString("Pushto"); - names[iso639_str3_to_key("qaa")] = QString("Reserved for local use"); + names[iso639_str3_to_key("qaa")] = QString("Original language"); // from DVB-SI (EN 300 468) names[iso639_str3_to_key("qtz")] = QString("Reserved for local use"); names[iso639_str3_to_key("que")] = QString("Quechua"); names[iso639_str3_to_key("raj")] = QString("Rajasthani"); diff --git a/mythtv/libs/libmythbase/iso639.h b/mythtv/libs/libmythbase/iso639.h index 07c088c..138d66d 100644 --- a/mythtv/libs/libmythbase/iso639.h +++ b/mythtv/libs/libmythbase/iso639.h @@ -62,7 +62,7 @@ static inline bool iso639_is_key_undefined(int code) static inline int iso639_str3_to_key(const unsigned char *iso639_2) { - return (iso639_2[0]<<16)|(iso639_2[1]<<8)|iso639_2[2]; + return (tolower(iso639_2[0])<<16)|(tolower(iso639_2[1])<<8)|tolower(iso639_2[2])); } static inline int iso639_str3_to_key(const char *iso639_2) -- 1.7.4.1