Moved functions from lang.h to lang.c for easy includion in Controller.mm

git-svn-id: svn://localhost/HandBrake/trunk@874 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/Jamfile b/libhb/Jamfile
index 9750cd0..bcf4a54 100644 (file)
--- a/libhb/Jamfile
+++ b/libhb/Jamfile
@@ -10,7 +10,8 @@ LIBHB_SRC =
 ipodutil.cpp common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
 demuxmpeg.c fifo.c render.c reader.c muxcommon.c muxmp4.c sync.c stream.c
 decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c decavcodec.c encxvid.c
-muxavi.c enclame.c muxogm.c encvorbis.c dvd.c muxmkv.c deblock.c deinterlace.c denoise.c detelecine.c ;
+muxavi.c enclame.c muxogm.c encvorbis.c dvd.c muxmkv.c deblock.c deinterlace.c 
+denoise.c detelecine.c lang.c ;
 
 Library libhb : $(LIBHB_SRC) ;
 

diff --git a/libhb/Makefile b/libhb/Makefile
index f5616dc..097116d 100644 (file)
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -25,7 +25,7 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \
           update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
           muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
           decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
-          dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c
+          dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c lang.c
 OTMP = $(SRCS:%.c=%.o) 
 OBJS = $(OTMP:%.cpp=%.o)
 

diff --git a/libhb/lang.h b/libhb/lang.h
index 8b6283b..ffaa76b 100644 (file)
--- a/libhb/lang.h
+++ b/libhb/lang.h
@@ -16,227 +16,13 @@ typedef struct iso639_lang_t
 
 } iso639_lang_t;
 
-static const iso639_lang_t languages[] =
-{ { "Unknown", "", "", "und" },
-  { "Afar", "", "aa", "aar" },
-  { "Abkhazian", "", "ab", "abk" },
-  { "Afrikaans", "", "af", "afr" },
-  { "Akan", "", "ak", "aka" },
-  { "Albanian", "", "sq", "alb" },
-  { "Amharic", "", "am", "amh" },
-  { "Arabic", "", "ar", "ara" },
-  { "Aragonese", "", "an", "arg" },
-  { "Armenian", "", "hy", "arm" },
-  { "Assamese", "", "as", "asm" },
-  { "Avaric", "", "av", "ava" },
-  { "Avestan", "", "ae", "ave" },
-  { "Aymara", "", "ay", "aym" },
-  { "Azerbaijani", "", "az", "aze" },
-  { "Bashkir", "", "ba", "bak" },
-  { "Bambara", "", "bm", "bam" },
-  { "Basque", "", "eu", "baq" },
-  { "Belarusian", "", "be", "bel" },
-  { "Bengali", "", "bn", "ben" },
-  { "Bihari", "", "bh", "bih" },
-  { "Bislama", "", "bi", "bis" },
-  { "Bosnian", "", "bs", "bos" },
-  { "Breton", "", "br", "bre" },
-  { "Bulgarian", "", "bg", "bul" },
-  { "Burmese", "", "my", "bur" },
-  { "Catalan", "", "ca", "cat" },
-  { "Chamorro", "", "ch", "cha" },
-  { "Chechen", "", "ce", "che" },
-  { "Chinese", "", "zh", "chi" },
-  { "Church Slavic", "", "cu", "chu" },
-  { "Chuvash", "", "cv", "chv" },
-  { "Cornish", "", "kw", "cor" },
-  { "Corsican", "", "co", "cos" },
-  { "Cree", "", "cr", "cre" },
-  { "Czech", "", "cs", "cze" },
-  { "Danish", "Dansk", "da", "dan" },
-  { "Divehi", "", "dv", "div" },
-  { "Dutch", "Nederlands", "nl", "dut" },
-  { "Dzongkha", "", "dz", "dzo" },
-  { "English", "English", "en", "eng" },
-  { "Esperanto", "", "eo", "epo" },
-  { "Estonian", "", "et", "est" },
-  { "Ewe", "", "ee", "ewe" },
-  { "Faroese", "", "fo", "fao" },
-  { "Fijian", "", "fj", "fij" },
-  { "Finnish", "Suomi", "fi", "fin" },
-  { "French", "Francais", "fr", "fre" },
-  { "Western Frisian", "", "fy", "fry" },
-  { "Fulah", "", "ff", "ful" },
-  { "Georgian", "", "ka", "geo" },
-  { "German", "Deutsch", "de", "ger" },
-  { "Gaelic (Scots)", "", "gd", "gla" },
-  { "Irish", "", "ga", "gle" },
-  { "Galician", "", "gl", "glg" },
-  { "Manx", "", "gv", "glv" },
-  { "Greek, Modern", "", "el", "gre" },
-  { "Guarani", "", "gn", "grn" },
-  { "Gujarati", "", "gu", "guj" },
-  { "Haitian", "", "ht", "hat" },
-  { "Hausa", "", "ha", "hau" },
-  { "Hebrew", "", "he", "heb" },
-  { "Herero", "", "hz", "her" },
-  { "Hindi", "", "hi", "hin" },
-  { "Hiri Motu", "", "ho", "hmo" },
-  { "Hungarian", "Magyar", "hu", "hun" },
-  { "Igbo", "", "ig", "ibo" },
-  { "Icelandic", "Islenska", "is", "ice" },
-  { "Ido", "", "io", "ido" },
-  { "Sichuan Yi", "", "ii", "iii" },
-  { "Inuktitut", "", "iu", "iku" },
-  { "Interlingue", "", "ie", "ile" },
-  { "Interlingua", "", "ia", "ina" },
-  { "Indonesian", "", "id", "ind" },
-  { "Inupiaq", "", "ik", "ipk" },
-  { "Italian", "Italiano", "it", "ita" },
-  { "Javanese", "", "jv", "jav" },
-  { "Japanese", "", "ja", "jpn" },
-  { "Kalaallisut (Greenlandic)", "", "kl", "kal" },
-  { "Kannada", "", "kn", "kan" },
-  { "Kashmiri", "", "ks", "kas" },
-  { "Kanuri", "", "kr", "kau" },
-  { "Kazakh", "", "kk", "kaz" },
-  { "Central Khmer", "", "km", "khm" },
-  { "Kikuyu", "", "ki", "kik" },
-  { "Kinyarwanda", "", "rw", "kin" },
-  { "Kirghiz", "", "ky", "kir" },
-  { "Komi", "", "kv", "kom" },
-  { "Kongo", "", "kg", "kon" },
-  { "Korean", "", "ko", "kor" },
-  { "Kuanyama", "", "kj", "kua" },
-  { "Kurdish", "", "ku", "kur" },
-  { "Lao", "", "lo", "lao" },
-  { "Latin", "", "la", "lat" },
-  { "Latvian", "", "lv", "lav" },
-  { "Limburgan", "", "li", "lim" },
-  { "Lingala", "", "ln", "lin" },
-  { "Lithuanian", "", "lt", "lit" },
-  { "Luxembourgish", "", "lb", "ltz" },
-  { "Luba-Katanga", "", "lu", "lub" },
-  { "Ganda", "", "lg", "lug" },
-  { "Macedonian", "", "mk", "mac" },
-  { "Marshallese", "", "mh", "mah" },
-  { "Malayalam", "", "ml", "mal" },
-  { "Maori", "", "mi", "mao" },
-  { "Marathi", "", "mr", "mar" },
-  { "Malay", "", "ms", "may" },
-  { "Malagasy", "", "mg", "mlg" },
-  { "Maltese", "", "mt", "mlt" },
-  { "Moldavian", "", "mo", "mol" },
-  { "Mongolian", "", "mn", "mon" },
-  { "Nauru", "", "na", "nau" },
-  { "Navajo", "", "nv", "nav" },
-  { "Ndebele, South", "", "nr", "nbl" },
-  { "Ndebele, North", "", "nd", "nde" },
-  { "Ndonga", "", "ng", "ndo" },
-  { "Nepali", "", "ne", "nep" },
-  { "Norwegian Nynorsk", "", "nn", "nno" },
-  { "Norwegian Bokmål", "", "nb", "nob" },
-  { "Norwegian", "Norsk", "no", "nor" },
-  { "Chichewa; Nyanja", "", "ny", "nya" },
-  { "Occitan (post 1500); Provençal", "", "oc", "oci" },
-  { "Ojibwa", "", "oj", "oji" },
-  { "Oriya", "", "or", "ori" },
-  { "Oromo", "", "om", "orm" },
-  { "Ossetian; Ossetic", "", "os", "oss" },
-  { "Panjabi", "", "pa", "pan" },
-  { "Persian", "", "fa", "per" },
-  { "Pali", "", "pi", "pli" },
-  { "Polish", "", "pl", "pol" },
-  { "Portuguese", "Portugues", "pt", "por" },
-  { "Pushto", "", "ps", "pus" },
-  { "Quechua", "", "qu", "que" },
-  { "Romansh", "", "rm", "roh" },
-  { "Romanian", "", "ro", "rum" },
-  { "Rundi", "", "rn", "run" },
-  { "Russian", "", "ru", "rus" },
-  { "Sango", "", "sg", "sag" },
-  { "Sanskrit", "", "sa", "san" },
-  { "Serbian", "", "sr", "scc" },
-  { "Croatian", "Hrvatski", "hr", "scr" },
-  { "Sinhala", "", "si", "sin" },
-  { "Slovak", "", "sk", "slo" },
-  { "Slovenian", "", "sl", "slv" },
-  { "Northern Sami", "", "se", "sme" },
-  { "Samoan", "", "sm", "smo" },
-  { "Shona", "", "sn", "sna" },
-  { "Sindhi", "", "sd", "snd" },
-  { "Somali", "", "so", "som" },
-  { "Sotho, Southern", "", "st", "sot" },
-  { "Spanish", "Espanol", "es", "spa" },
-  { "Sardinian", "", "sc", "srd" },
-  { "Swati", "", "ss", "ssw" },
-  { "Sundanese", "", "su", "sun" },
-  { "Swahili", "", "sw", "swa" },
-  { "Swedish", "Svenska", "sv", "swe" },
-  { "Tahitian", "", "ty", "tah" },
-  { "Tamil", "", "ta", "tam" },
-  { "Tatar", "", "tt", "tat" },
-  { "Telugu", "", "te", "tel" },
-  { "Tajik", "", "tg", "tgk" },
-  { "Tagalog", "", "tl", "tgl" },
-  { "Thai", "", "th", "tha" },
-  { "Tibetan", "", "bo", "tib" },
-  { "Tigrinya", "", "ti", "tir" },
-  { "Tonga (Tonga Islands)", "", "to", "ton" },
-  { "Tswana", "", "tn", "tsn" },
-  { "Tsonga", "", "ts", "tso" },
-  { "Turkmen", "", "tk", "tuk" },
-  { "Turkish", "", "tr", "tur" },
-  { "Twi", "", "tw", "twi" },
-  { "Uighur", "", "ug", "uig" },
-  { "Ukrainian", "", "uk", "ukr" },
-  { "Urdu", "", "ur", "urd" },
-  { "Uzbek", "", "uz", "uzb" },
-  { "Venda", "", "ve", "ven" },
-  { "Vietnamese", "", "vi", "vie" },
-  { "Volapük", "", "vo", "vol" },
-  { "Welsh", "", "cy", "wel" },
-  { "Walloon", "", "wa", "wln" },
-  { "Wolof", "", "wo", "wol" },
-  { "Xhosa", "", "xh", "xho" },
-  { "Yiddish", "", "yi", "yid" },
-  { "Yoruba", "", "yo", "yor" },
-  { "Zhuang", "", "za", "zha" },
-  { "Zulu", "", "zu", "zul" },
-  { NULL, NULL, NULL } };
-
-static iso639_lang_t * lang_for_code( int code )
-{
-    char code_string[2];
-    iso639_lang_t * lang;
-
-    code_string[0] = ( code >> 8 ) & 0xFF;
-    code_string[1] = code & 0xFF;
-
-    for( lang = (iso639_lang_t*) languages; lang->eng_name; lang++ )
-    {
-        if( !strncmp( lang->iso639_1, code_string, 2 ) )
-        {
-            return lang;
-        }
-    }
-
-    return (iso639_lang_t*) languages;
-}
-
-static iso639_lang_t * lang_for_english( const char * english )
-{
-    iso639_lang_t * lang;
-    
-    for( lang = (iso639_lang_t*) languages; lang->eng_name; lang++ )
-    {
-        if( !strcmp( lang->eng_name, english ) )
-        {
-            return lang;
-        }
-    }
+#ifdef __cplusplus
+extern "C" {
+#endif
+iso639_lang_t * lang_for_code( int code );
 
-    return (iso639_lang_t*) languages;
+iso639_lang_t * lang_for_english( const char * english );
+#ifdef __cplusplus
 }
-
+#endif
 #endif

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 11ff795..62ef8e7 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -6,7 +6,7 @@
 
 #include "Controller.h"
 #include "a52dec/a52.h"
-#include "lang.h"
+#import "lang.h"
 #import "HBOutputPanelController.h"
 #import "HBPreferencesController.h"
 /* Added to integrate scanning into HBController */

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index d2518dd..ab01f11 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -126,6 +126,7 @@
                A2DFC66F0C6196D900E66E89 /* actionWidgetPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */; };
                A2DFC6750C6197C600E66E89 /* MVMenuButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A2DFC6740C6197C600E66E89 /* MVMenuButton.h */; };
                A2DFC6770C61980700E66E89 /* MVMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DFC6760C61980700E66E89 /* MVMenuButton.m */; };
+               B48359A80C82960500E04440 /* lang.c in Sources */ = {isa = PBXBuildFile; fileRef = B48359A70C82960500E04440 /* lang.c */; };
                EAA526930C3B25D200944FF2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = EAA526920C3B25D200944FF2 /* stream.c */; };
                EAA526940C3B25D200944FF2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = EAA526920C3B25D200944FF2 /* stream.c */; };
                FC8519500C59A02C0073812C /* denoise.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194C0C59A02C0073812C /* denoise.c */; };
@@ -266,6 +267,7 @@
                A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionWidgetPressed.png; sourceTree = "<group>"; };
                A2DFC6740C6197C600E66E89 /* MVMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MVMenuButton.h; sourceTree = "<group>"; };
                A2DFC6760C61980700E66E89 /* MVMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MVMenuButton.m; sourceTree = "<group>"; };
+               B48359A70C82960500E04440 /* lang.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lang.c; path = ../libhb/lang.c; sourceTree = SOURCE_ROOT; };
                EAA526920C3B25D200944FF2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = stream.c; path = ../libhb/stream.c; sourceTree = SOURCE_ROOT; };
                FC85194C0C59A02C0073812C /* denoise.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = denoise.c; path = ../libhb/denoise.c; sourceTree = SOURCE_ROOT; };
                FC85194D0C59A02C0073812C /* deinterlace.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deinterlace.c; path = ../libhb/deinterlace.c; sourceTree = SOURCE_ROOT; };
@@ -387,6 +389,7 @@
                526FBC8D0B4CA9F90064E04C /* libhb Sources */ = {
                        isa = PBXGroup;
                        children = (
+                               B48359A70C82960500E04440 /* lang.c */,
                                A273E0950C57C19500493A45 /* muxmkv.c */,
                                EAA526920C3B25D200944FF2 /* stream.c */,
                                0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */,
@@ -760,6 +763,7 @@
                                FC8519510C59A02C0073812C /* deinterlace.c in Sources */,
                                FC8519520C59A02C0073812C /* deblock.c in Sources */,
                                FC8519530C59A02C0073812C /* detelecine.c in Sources */,
+                               B48359A80C82960500E04440 /* lang.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };