Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / text / iso_lang.c

diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index 30c011b464050254722c3e5c3e8bec25a894fd2f..3a28cd91a2b0b41667ef1c8f948ac26e2f4f213e 100644 (file)
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -25,11 +25,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /*****************************************************************************
  * Local tables
@@ -39,43 +44,12 @@
 static const iso639_lang_t unknown_language =
     { "Unknown", "Unknown", "??", "???", "???" };
 
-/*****************************************************************************
- * DecodeLanguage: gives the long language name from the two-letter
- *                 ISO-639 code
- *****************************************************************************/
-const char * DecodeLanguage( uint16_t i_code )
-{
-    const iso639_lang_t * p_lang;
-    uint8_t psz_code[3];
-
-    psz_code[0] = i_code >> 8;
-    psz_code[1] = i_code & 0xff;
-    psz_code[2] = '\0';
-
-    for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
-    {
-        if( !memcmp( p_lang->psz_iso639_1, psz_code, 2 ) )
-        {
-# if 0
-            if( *p_lang->psz_native_name )
-            {
-                return p_lang->psz_native_name;
-            }
-#endif
-
-            return _( p_lang->psz_eng_name );
-        }
-    }
-
-    return _( "Unknown" );
-}
-
 const iso639_lang_t * GetLang_1( const char * psz_code )
 {
     const iso639_lang_t *p_lang;
 
     for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
-        if( !strncmp( p_lang->psz_iso639_1, psz_code, 2 ) )
+        if( !strncasecmp( p_lang->psz_iso639_1, psz_code, 2 ) )
             return p_lang;
 
     return &unknown_language;
@@ -86,7 +60,7 @@ const iso639_lang_t * GetLang_2T( const char * psz_code )
     const iso639_lang_t *p_lang;
 
     for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
-        if( !strncmp( p_lang->psz_iso639_2T, psz_code, 3 ) )
+        if( !strncasecmp( p_lang->psz_iso639_2T, psz_code, 3 ) )
             return p_lang;
 
     return &unknown_language;
@@ -97,7 +71,7 @@ const iso639_lang_t * GetLang_2B( const char * psz_code )
     const iso639_lang_t *p_lang;
 
     for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
-        if( !strncmp( p_lang->psz_iso639_2B, psz_code, 3 ) )
+        if( !strncasecmp( p_lang->psz_iso639_2B, psz_code, 3 ) )
             return p_lang;
 
     return &unknown_language;