* src/misc/configuration.c, include/configuration.h: added a change_action_add()metho...

[vlc] / src / misc / iso_lang.c

diff --git a/src/misc/iso_lang.c b/src/misc/iso_lang.c
index 55ac60866b7f9d2651dd9866741eb0c97d7178e5..d84613facbc51e7ba025f7bb812494ab37fe5f13 100644 (file)
--- a/src/misc/iso_lang.c
+++ b/src/misc/iso_lang.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * iso_lang.c: function to decode language code (in dvd or a52 for instance).
  *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: iso_lang.c,v 1.7 2002/11/10 18:04:24 sam Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id: iso_lang.c,v 1.11 2004/01/06 12:02:06 zorglub Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *         Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -34,15 +34,7 @@
 /*****************************************************************************
  * Local tables
  *****************************************************************************/
-
-#define DEFINE_LANGUAGE_CODE(engName, nativeName, iso1, iso2T, iso2B) \
-          { engName, nativeName, #iso1, #iso2T, #iso2B },
-
-static const iso639_lang_t p_languages[] =
-{
 #include "iso-639_def.h"
-    { NULL, NULL, NULL, NULL, NULL }
-};
 
 static const iso639_lang_t unknown_language =
     { "Unknown", "Unknown", "??", "???", "???" };
@@ -51,13 +43,13 @@ static const iso639_lang_t unknown_language =
  * DecodeLanguage: gives the long language name from the two-letter
  *                 ISO-639 code
  *****************************************************************************/
-const char * DecodeLanguage( u16 i_code )
+const char * DecodeLanguage( uint16_t i_code )
 {
     const iso639_lang_t * p_lang;
-    u8 psz_code[3];
+    uint8_t psz_code[3];
 
     psz_code[0] = i_code >> 8;
-    psz_code[1] = i_code;
+    psz_code[1] = i_code & 0xff;
     psz_code[2] = '\0';
 
     for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
@@ -90,7 +82,7 @@ const iso639_lang_t * GetLang_1( const char * psz_code )
 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 ) )
             return p_lang;