X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHBSubtitles.m;h=aca6c023b7df9c4dd3934c4a1335050113bc38b1;hb=0127c54ac319533945d02788f0a22d02fe699c7a;hp=c125779e14c8ee2e5f4b8f3ff28dd60132d13034;hpb=4a7c57d43ac03556597821bdc3469c00a319b7b7;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m index c125779e..aca6c023 100644 --- a/macosx/HBSubtitles.m +++ b/macosx/HBSubtitles.m @@ -8,6 +8,13 @@ #import "HBSubtitles.h" #include "hb.h" + + + + + + + @implementation HBSubtitles - (id)init { @@ -17,6 +24,236 @@ fTitle = NULL; } + /* setup our array of languages */ + languagesArray = [[NSMutableArray alloc] init]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Any",@"und",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Afar",@"aar",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Abkhazian",@"abk",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Afrikaans",@"afr",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Akan",@"ak",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Albanian",@"sqi",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Amharic",@"amh",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Arabic",@"ara",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Aragonese",@"arg",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Armenian",@"hye",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Assamese",@"asm",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Avaric",@"ava",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Avestan",@"ave",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Aymara",@"aym",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Azerbaijani",@"aze",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bashkir",@"bak",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bambara",@"bam",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Basque",@"eus",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Belarusian",@"bel",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bengali",@"ben",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bihari",@"bih",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bislama",@"bis",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bosnian",@"bos",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Breton",@"bre",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Bulgarian",@"bul",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Burmese",@"mya",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Catalan",@"cat",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Chamorro",@"cha",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Chechen",@"che",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Chinese",@"zho",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Church Slavic",@"chu",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Chuvash",@"chv",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Cornish",@"cor",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Corsican",@"cos",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Cree",@"cre",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Czech",@"ces",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Danish",@"dan",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Divehi",@"div",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Dutch",@"nld",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Dzongkha",@"dzo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"English",@"eng",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Esperanto",@"epo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Estonian",@"est",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ewe",@"ewe",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Faroese",@"fao",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Fijian",@"fij",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Finnish",@"fin",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"French",@"fra",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Western Frisian",@"fry",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Fulah",@"ful",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Georgian",@"kat",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"German",@"deu",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Gaelic (Scots)",@"gla",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Irish",@"gle",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Galician",@"glg",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Manx",@"glv",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Greek, Modern",@"ell",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Guarani",@"grn",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Gujarati",@"guj",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Haitian",@"hat",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Hausa",@"hau",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Hebrew",@"heb",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Herero",@"her",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Hindi",@"hin",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Hiri Motu",@"hmo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Hungarian",@"hun",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Igbo",@"ibo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Icelandic",@"isl",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ido",@"ido",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sichuan Yi",@"iii",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Inuktitut",@"iku",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Interlingue",@"ile",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Interlingua",@"ina",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Indonesian",@"ind",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Inupiaq",@"ipk",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Italian",@"ita",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Javanese",@"jav",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Japanese",@"jpn",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kalaallisut (Greenlandic)",@"kal",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kannada",@"kan",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kashmiri",@"kas",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kanuri",@"kau",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kazakh",@"kaz",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Central Khmer",@"khm",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kikuyu",@"kik",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kinyarwanda",@"kin",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kirghiz",@"kir",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Komi",@"kom",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kongo",@"kon",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Korean",@"kor",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kuanyama",@"kua",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Kurdish",@"kur",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Lao",@"lao",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Latin",@"lat",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Latvian",@"lav",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Limburgan",@"lim",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Lingala",@"lin",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Lithuanian",@"lit",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Luxembourgish",@"ltz",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Luba-Katanga",@"lub",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ganda",@"lug",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Macedonian",@"mkd",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Marshallese",@"mah",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Malayalam",@"mal",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Maori",@"mri",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Marathi",@"mar",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Malay",@"msa",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Malagasy",@"mlg",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Maltese",@"mlt",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Moldavian",@"mol",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Mongolian",@"mon",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Nauru",@"nau",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Navajo",@"nav",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ndebele, South",@"nbl",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ndebele, North",@"nde",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ndonga",@"ndo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Nepali",@"nep",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian Nynorsk",@"nno",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian Bokmål",@"nob",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian",@"nor",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Chichewa; Nyanja",@"nya",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Occitan (post 1500); Provençal",@"oci",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ojibwa",@"oji",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Oriya",@"ori",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Oromo",@"orm",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ossetian; Ossetic",@"und",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Panjabi",@"pan",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Persian",@"fas",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Pali",@"pli",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Portuguese",@"por",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Pushto",@"pus",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Quechua",@"que",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Romansh",@"roh",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Romanian",@"ron",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Rundi",@"run",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Russian",@"rus",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sango",@"sag",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sanskrit",@"san",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Serbian",@"srp",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Croatian",@"hrv",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sinhala",@"sin",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Slovak",@"slk",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Slovenian",@"slv",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Northern Sami",@"sme",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Samoan",@"smo",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Shona",@"sna",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sindhi",@"snd",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Somali",@"som",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sotho, Southern",@"sot",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Spanish",@"spa",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sardinian",@"srd",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Swati",@"ssw",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Sundanese",@"sun",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Swahili",@"swa",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Swedish",@"swe",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tahitian",@"tah",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tamil",@"tam",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tatar",@"tat",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Telugu",@"tel",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tajik",@"tgk",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tagalog",@"tgl",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Thai",@"tha",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tibetan",@"bod",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tigrinya",@"tir",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tonga (Tonga Islands)",@"ton",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tswana",@"tsn",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Tsonga",@"tso",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Turkmen",@"tuk",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Turkish",@"tur",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Twi",@"twi",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Uighur",@"uig",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Ukrainian",@"ukr",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Urdu",@"urd",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Uzbek",@"uzb",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Venda",@"ven",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Vietnamese",@"vie",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Volapük",@"vol",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Welsh",@"cym",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Walloon",@"wln",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Wolof",@"wol",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Xhosa",@"xho",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Yiddish",@"yid",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Yoruba",@"yor",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"ZhuangZhuang",@"zha",nil]]; + [languagesArray addObject:[NSArray arrayWithObjects:@"Zulu",@"zul",nil]]; + + languagesArrayDefIndex = 40; + + /* populate the charCodeArray */ + charCodeArray = [[NSMutableArray alloc] init]; + [charCodeArray addObject:@"ANSI_X3.4-1968"]; + [charCodeArray addObject:@"ANSI_X3.4-1986"]; + [charCodeArray addObject:@"ANSI_X3.4"]; + [charCodeArray addObject:@"ANSI_X3.110-1983"]; + [charCodeArray addObject:@"ANSI_X3.110"]; + [charCodeArray addObject:@"ASCII"]; + [charCodeArray addObject:@"ECMA-114"]; + [charCodeArray addObject:@"ECMA-118"]; + [charCodeArray addObject:@"ECMA-128"]; + [charCodeArray addObject:@"ECMA-CYRILLIC"]; + [charCodeArray addObject:@"IEC_P27-1"]; + [charCodeArray addObject:@"ISO-8859-1"]; + [charCodeArray addObject:@"ISO-8859-2"]; + [charCodeArray addObject:@"ISO-8859-3"]; + [charCodeArray addObject:@"ISO-8859-4"]; + [charCodeArray addObject:@"ISO-8859-5"]; + [charCodeArray addObject:@"ISO-8859-6"]; + [charCodeArray addObject:@"ISO-8859-7"]; + [charCodeArray addObject:@"ISO-8859-8"]; + [charCodeArray addObject:@"ISO-8859-9"]; + [charCodeArray addObject:@"ISO-8859-9E"]; + [charCodeArray addObject:@"ISO-8859-10"]; + [charCodeArray addObject:@"ISO-8859-11"]; + [charCodeArray addObject:@"ISO-8859-13"]; + [charCodeArray addObject:@"ISO-8859-14"]; + [charCodeArray addObject:@"ISO-8859-15"]; + [charCodeArray addObject:@"ISO-8859-16"]; + [charCodeArray addObject:@"UTF-7"]; + [charCodeArray addObject:@"UTF-8"]; + [charCodeArray addObject:@"UTF-16"]; + [charCodeArray addObject:@"UTF-16LE"]; + [charCodeArray addObject:@"UTF-16BE"]; + [charCodeArray addObject:@"UTF-32"]; + [charCodeArray addObject:@"UTF-32LE"]; + [charCodeArray addObject:@"UTF-32BE"]; + + charCodeArrayDefIndex = 11; + return self; } @@ -30,6 +267,56 @@ return; } + /* reset the subtitle source array */ + if (subtitleSourceArray) + { + [subtitleSourceArray release]; + } + subtitleSourceArray = [[NSMutableArray alloc] init]; + + /* now populate the array with the source subtitle track info */ + if (fTitle) + { + hb_subtitle_t *subtitle; + hb_subtitle_config_t sub_config; + int i; + for(i = 0; i < hb_list_count( fTitle->list_subtitle ); i++ ) + { + NSString * trackTypeString = @""; + int isPictureSub = 0; + subtitle = (hb_subtitle_t *) hb_list_item( fTitle->list_subtitle, i ); + sub_config = subtitle->config; + + if (subtitle->format == PICTURESUB) + { + trackTypeString = @"- (Bitmap)"; + isPictureSub = 1; + } + else + { + trackTypeString = @"- (Text)"; + } + + /* create a dictionary of source subtitle information to store in our array */ + NSString *popupName = [NSString stringWithFormat:@"%d - %@ %@",i,[NSString stringWithUTF8String:subtitle->lang],trackTypeString]; + NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init]; + /* Subtitle Source track popup index */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:i] forKey:@"sourceTrackNum"]; + /* Subtitle Source track type */ + [newSubtitleSourceTrack setObject:popupName forKey:@"sourceTrackName"]; + /* Subtitle Source track type (Source, Srt, etc.) */ + [newSubtitleSourceTrack setObject:@"Source" forKey:@"sourceTrackType"]; + /* Subtitle Source track popup isPictureSub */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:isPictureSub] forKey:@"sourceTrackisPictureSub"]; + + [subtitleSourceArray addObject:newSubtitleSourceTrack]; + [newSubtitleSourceTrack autorelease]; + } + } + + + + /* reset the subtitle output array */ if (subtitleArray) { [subtitleArray release]; @@ -67,17 +354,132 @@ return newSubtitleTrack; } -- (NSMutableArray*) getSubtitleArray: (NSMutableArray *) subtitlesArray +- (void)createSubtitleSrtTrack:(NSString *)filePath +{ + /* Create a new entry for the subtitle source array so it shows up in our subtitle source list */ + NSString *displayname = [filePath lastPathComponent];// grok an appropriate display name from the srt subtitle */ + /* create a dictionary of source subtitle information to store in our array */ + NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init]; + /* Subtitle Source track popup index */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]+1] forKey:@"sourceTrackNum"]; + /* Subtitle Source track type */ + [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"]; + /* Subtitle Source track type (Source, Srt, etc.) */ + [newSubtitleSourceTrack setObject:@"SRT" forKey:@"sourceTrackType"]; + [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"]; + /* Subtitle Source track type */ + [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"]; + /* Subtitle Source track popup isPictureSub */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackisPictureSub"]; + + [subtitleSourceArray addObject:newSubtitleSourceTrack]; + [newSubtitleSourceTrack autorelease]; + + /* Now create a new srt subtitle dictionary assuming the user wants to add it to their list + * Note: the subtitle array always has last entry for "None", so we need to replace its + * position in the array and tack a "None" track back on the end of the list */ + [subtitleArray removeObjectAtIndex:[subtitleArray count] - 1]; + + + NSMutableDictionary *newSubtitleSrtTrack = [[NSMutableDictionary alloc] init]; + /* Subtitle Source track popup index */ + if ([subtitleArray count] == 0) // we now have an empty array so this will be our first track + { + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count] + 1] forKey:@"subtitleSourceTrackNum"]; + } + else + { + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]] forKey:@"subtitleSourceTrackNum"]; + } + + [newSubtitleSrtTrack setObject:@"SRT" forKey:@"sourceTrackType"]; + [newSubtitleSrtTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"]; + /* Subtitle Source track popup language */ + [newSubtitleSrtTrack setObject:displayname forKey:@"subtitleSourceTrackName"]; + /* Subtitle Source track popup isPictureSub */ + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackisPictureSub"]; + /* Subtitle track forced state */ + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"]; + /* Subtitle track burned state */ + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"]; + /* Subtitle track default state */ + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"]; + + /* now the srt only info, Language, Chart Code and offset */ + [newSubtitleSrtTrack setObject:filePath forKey:@"subtitleSourceSrtFilePath"]; + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:languagesArrayDefIndex] forKey:@"subtitleTrackSrtLanguageIndex"]; + [newSubtitleSrtTrack setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"]; + [newSubtitleSrtTrack setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"]; + + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCodeIndex"]; + [newSubtitleSrtTrack setObject:[charCodeArray objectAtIndex:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCode"]; + + [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackSrtOffset"]; + + + [subtitleArray addObject:newSubtitleSrtTrack]; + [newSubtitleSrtTrack release]; + + /* now add back the none track to the end of the array */ + [self addSubtitleTrack]; + + +} + +/* used to return the current subtitleArray to controller.m */ +- (NSMutableArray*) getSubtitleArray { - //NSMutableArray *returnSubtitlesArray = [[NSMutableArray alloc] init]; - //[returnSubtitlesArray initWithArray:subtitleArray]; - //[returnSubtitlesArray autorelease]; return subtitleArray; } - (void)containerChanged:(int) newContainer { -container = newContainer; + container = newContainer; +} + +- (void)setNewSubtitles:(NSMutableArray*) newSubtitleArray +{ + /* Note: we need to look for external subtitles so it can be added to the source array track. + * Remember the source container subs are already loaded with resetTitle which is already called + * so any external sub sources need to be added to our source subs here + */ + + int i = 0; + NSEnumerator *enumerator = [newSubtitleArray objectEnumerator]; + id tempObject; + while ( tempObject = [enumerator nextObject] ) + { + /* We have an srt track */ + if ([[tempObject objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"]) + { + NSString *filePath = [tempObject objectForKey:@"subtitleSourceSrtFilePath"]; + /* Start replicate the add new srt code above */ + /* Create a new entry for the subtitle source array so it shows up in our subtitle source list */ + NSString *displayname = [filePath lastPathComponent];// grok an appropriate display name from the srt subtitle */ + /* create a dictionary of source subtitle information to store in our array */ + NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init]; + /* Subtitle Source track popup index */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]+1] forKey:@"sourceTrackNum"]; + /* Subtitle Source track type */ + [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"]; + /* Subtitle Source track type (Source, Srt, etc.) */ + [newSubtitleSourceTrack setObject:@"SRT" forKey:@"sourceTrackType"]; + [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"]; + /* Subtitle Source track type */ + [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"]; + /* Subtitle Source track popup isPictureSub */ + [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackisPictureSub"]; + + [subtitleSourceArray addObject:newSubtitleSourceTrack]; + [newSubtitleSourceTrack autorelease]; + /* END replicate the add new srt code above */ + } + i++; + } + + + /*Set the subtitleArray to the newSubtitleArray */ + [subtitleArray setArray:newSubtitleArray]; } #pragma mark - @@ -109,16 +511,9 @@ container = newContainer; if ([[aTableColumn identifier] isEqualToString:@"track"]) { /* 'track' is a popup of all available source subtitle tracks for the given title */ - - NSPopUpButtonCell *cellTrackPopup = [[NSPopUpButtonCell alloc] init]; [cellTrackPopup autorelease]; /* Set the Popups properties */ - /* Following two lines can be used to show kind of a text field with indicator arrows which - * will popup when clicked on. Comment out for a standard style popup */ - //[cellTrackPopup setShowsBorderOnlyWhileMouseInside:YES]; - //[cellTrackPopup setBordered:NO]; - [cellTrackPopup setControlSize:NSSmallControlSize]; [cellTrackPopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]]; @@ -134,71 +529,97 @@ container = newContainer; [[cellTrackPopup menu] addItemWithTitle: @"Foreign Audio Search - (Bitmap)" action: NULL keyEquivalent: @""]; } - if (fTitle) + int i; + for(i = 0; i < [subtitleSourceArray count]; i++ ) { - hb_subtitle_t *subtitle; - hb_subtitle_config_t sub_config; - int i; - for(i = 0; i < hb_list_count( fTitle->list_subtitle ); i++ ) - { - NSString * trackTypeString = @""; - subtitle = (hb_subtitle_t *) hb_list_item( fTitle->list_subtitle, i ); - sub_config = subtitle->config; - - if (subtitle->format == PICTURESUB) - { - trackTypeString = @"- (Bitmap)"; - } - else - { - trackTypeString = @"- (Text)"; - } - - - NSString *popupMenuItemDescription = [NSString stringWithFormat:@"%d - %@ %@",i,[NSString stringWithUTF8String:subtitle->lang],trackTypeString]; - - [[cellTrackPopup menu] addItemWithTitle: popupMenuItemDescription action: NULL keyEquivalent: @""]; - } + [[cellTrackPopup menu] addItemWithTitle: [[subtitleSourceArray objectAtIndex:i] objectForKey: @"sourceTrackName"] action: NULL keyEquivalent: @""]; } + [aTableColumn setDataCell:cellTrackPopup]; } else if ([[aTableColumn identifier] isEqualToString:@"forced"]) { - /* 'forced' is a checkbox to determine if a given source track is only to be forced */ - NSButtonCell *cellForcedCheckBox = [[NSButtonCell alloc] init]; - [cellForcedCheckBox autorelease]; - [cellForcedCheckBox setButtonType:NSSwitchButton]; - [cellForcedCheckBox setImagePosition:NSImageOnly]; - [cellForcedCheckBox setAllowsMixedState:NO]; - [aTableColumn setDataCell:cellForcedCheckBox]; - + /* 'forced' is a checkbox to determine if a given source track is only to be forced */ + NSButtonCell *cellForcedCheckBox = [[NSButtonCell alloc] init]; + [cellForcedCheckBox autorelease]; + [cellForcedCheckBox setButtonType:NSSwitchButton]; + [cellForcedCheckBox setImagePosition:NSImageOnly]; + [cellForcedCheckBox setAllowsMixedState:NO]; + [aTableColumn setDataCell:cellForcedCheckBox]; + } else if ([[aTableColumn identifier] isEqualToString:@"burned"]) { - /* 'burned' is a checkbox to determine if a given source track is only to be burned */ - NSButtonCell *cellBurnedCheckBox = [[NSButtonCell alloc] init]; - [cellBurnedCheckBox autorelease]; - [cellBurnedCheckBox setButtonType:NSSwitchButton]; - [cellBurnedCheckBox setImagePosition:NSImageOnly]; - [cellBurnedCheckBox setAllowsMixedState:NO]; - [aTableColumn setDataCell:cellBurnedCheckBox]; + /* 'burned' is a checkbox to determine if a given source track is only to be burned */ + NSButtonCell *cellBurnedCheckBox = [[NSButtonCell alloc] init]; + [cellBurnedCheckBox autorelease]; + [cellBurnedCheckBox setButtonType:NSSwitchButton]; + [cellBurnedCheckBox setImagePosition:NSImageOnly]; + [cellBurnedCheckBox setAllowsMixedState:NO]; + [aTableColumn setDataCell:cellBurnedCheckBox]; } else if ([[aTableColumn identifier] isEqualToString:@"default"]) { - NSButtonCell *cellDefaultCheckBox = [[NSButtonCell alloc] init]; - [cellDefaultCheckBox autorelease]; - [cellDefaultCheckBox setButtonType:NSSwitchButton]; - [cellDefaultCheckBox setImagePosition:NSImageOnly]; - [cellDefaultCheckBox setAllowsMixedState:NO]; - [aTableColumn setDataCell:cellDefaultCheckBox]; + NSButtonCell *cellDefaultCheckBox = [[NSButtonCell alloc] init]; + [cellDefaultCheckBox autorelease]; + [cellDefaultCheckBox setButtonType:NSSwitchButton]; + [cellDefaultCheckBox setImagePosition:NSImageOnly]; + [cellDefaultCheckBox setAllowsMixedState:NO]; + [aTableColumn setDataCell:cellDefaultCheckBox]; + } + /* These next three columns only apply to srt's. they are disabled for source subs */ + else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"]) + { + /* 'srt_lang' is a popup of commonly used languages to be matched to the source srt file */ + NSPopUpButtonCell *cellSrtLangPopup = [[NSPopUpButtonCell alloc] init]; + [cellSrtLangPopup autorelease]; + /* Set the Popups properties */ + [cellSrtLangPopup setControlSize:NSSmallControlSize]; + [cellSrtLangPopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]]; + /* list our languages as per the languagesArray */ + int i; + for(i = 0; i < [languagesArray count]; i++ ) + { + [[cellSrtLangPopup menu] addItemWithTitle: [[languagesArray objectAtIndex:i] objectAtIndex:0] action: NULL keyEquivalent: @""]; + } + [aTableColumn setDataCell:cellSrtLangPopup]; + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"]) + { + /* 'srt_charcode' is a popup of commonly used character codes to be matched to the source srt file */ + NSPopUpButtonCell *cellSrtCharCodePopup = [[NSPopUpButtonCell alloc] init]; + [cellSrtCharCodePopup autorelease]; + /* Set the Popups properties */ + [cellSrtCharCodePopup setControlSize:NSSmallControlSize]; + [cellSrtCharCodePopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]]; + /* list our character codes, as per charCodeArray */ + + int i; + for(i = 0; i < [charCodeArray count]; i++ ) + { + [[cellSrtCharCodePopup menu] addItemWithTitle: [charCodeArray objectAtIndex:i] action: NULL keyEquivalent: @""]; + } + [aTableColumn setDataCell:cellSrtCharCodePopup]; + + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"]) + { + if ([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtOffset"]) + { + cellEntry = [NSString stringWithFormat:@"%d",[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtOffset"] intValue]]; + } + else + { + cellEntry = [NSString stringWithFormat:@"%d",0]; + } } else { - cellEntry = nil; + cellEntry = nil; } - + return cellEntry; } @@ -215,6 +636,7 @@ container = newContainer; { int sourceSubtitleIndex; bool isPictureSub = FALSE; + if (rowIndex == 0) { sourceSubtitleIndex = [anObject intValue] - 2; @@ -230,11 +652,7 @@ container = newContainer; } else { - hb_subtitle_t * subtitle; - hb_subtitle_config_t sub_config; - subtitle = (hb_subtitle_t *) hb_list_item( fTitle->list_subtitle, sourceSubtitleIndex ); - sub_config = subtitle->config; - if (subtitle->format == PICTURESUB) + if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackisPictureSub"] intValue] ==1) { isPictureSub = TRUE; } @@ -249,8 +667,28 @@ container = newContainer; /* if we are not picture sub, then we must be a text sub, handbrake does not support burning in text subs */ [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"]; } + + /* check to see if we are an srt, in which case set our file path and source track type kvp's*/ + + if (rowIndex == 0 && [anObject intValue] == 1) // we are foreign lang search + { + [[subtitleArray objectAtIndex:rowIndex] setObject:@"Source" forKey:@"subtitleSourceTrackType"]; + } + else + { + if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"] isEqualToString:@"SRT"]) + { + [[subtitleArray objectAtIndex:rowIndex] setObject:@"SRT" forKey:@"subtitleSourceTrackType"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceSrtFilePath"] forKey:@"subtitleSourceSrtFilePath"]; + } + else + { + [[subtitleArray objectAtIndex:rowIndex] setObject:@"Source" forKey:@"subtitleSourceTrackType"]; + } + } + } - } + } else if ([[aTableColumn identifier] isEqualToString:@"forced"]) { [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackForced"]; @@ -270,7 +708,7 @@ container = newContainer; { [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"]; } - i++; + i++; } } } @@ -289,42 +727,88 @@ container = newContainer; { [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"]; } - i++; + i++; } } } + /* These next three columns only apply to srt's. they are disabled for source subs */ + else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"]) + { + + [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackSrtLanguageIndex"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:[anObject intValue]] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:[anObject intValue]] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"]; + + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"]) + { + /* charCodeArray */ + [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackSrtCharCodeIndex"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[charCodeArray objectAtIndex:[anObject intValue]] forKey:@"subtitleTrackSrtCharCode"]; + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"]) + { + [[subtitleArray objectAtIndex:rowIndex] setObject:anObject forKey:@"subtitleTrackSrtOffset"]; + } /* now lets do a bit of logic to add / remove tracks as necessary via the "None" track (index 0) */ if ([[aTableColumn identifier] isEqualToString:@"track"]) { - - /* since mp4 only supports burned in vobsubs (bitmap) we need to make sure burned in is specified */ + + /* Since currently no quicktime based playback devices support soft vobsubs (bitmap) in mp4, we make sure + * "burned in" is specified by default to avoid massive confusion and anarchy. However we also want to guard against + * multiple burned in subtitle tracks as libhb would ignore all but the first one anyway. Plus it would probably be + * stupid. + */ if (container == HB_MUX_MP4 && [anObject intValue] != 0) { - /* so, if isPictureSub = TRUE and we are mp4, we now have to A) set burned-in to 1 and b) remove any other - * tracks specified that are burned in */ if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 1) { - [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"]; + /* lets see if there are currently any burned in subs specified */ + NSEnumerator *enumerator = [subtitleArray objectEnumerator]; + id tempObject; + BOOL subtrackBurnedInFound = NO; + while ( tempObject = [enumerator nextObject] ) + { + if ([[tempObject objectForKey:@"subtitleTrackBurned"] intValue] == 1) + { + subtrackBurnedInFound = YES; + } + } + /* if we have no current vobsub set to burn it in ... burn it in by default */ + if(!subtrackBurnedInFound) + { + [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"]; + } } } - - /* We use the track popup index number (presumes index 0 is "None" which is ignored and only used to remove tracks if need be) + /* We use the track popup index number (presumes index 0 is "None" which is ignored and only used to remove tracks if need be) * to determine whether to 1 modify an existing track, 2. add a new empty "None" track or 3. remove an existing track. */ - + if ([anObject intValue] != 0 && rowIndex == [subtitleArray count] - 1) // if we have a last track which != "None" { /* add a new empty None track */ [self addSubtitleTrack]; + } - else if ([anObject intValue] == 0 && rowIndex != ([subtitleArray count] -1))// if this track is none and not the last track displayed + else if ([anObject intValue] == 0 && rowIndex != ([subtitleArray count] -1))// if this track is set to "None" and not the last track displayed { /* we know the user chose to remove this track by setting it to None, so remove it from the array */ - [subtitleArray removeObjectAtIndex: rowIndex]; + /* However,if this is the first track we have to reset the selected index of the next track by + 1, since it will now become + * the first track, which has to account for the extra "Foreign Language Search" index. */ + if (rowIndex == 0 && [[[subtitleArray objectAtIndex: 1] objectForKey: @"subtitleSourceTrackNum"] intValue] != 0) + { + /* get the index of the selection in row one (which is track two) */ + int trackOneSelectedIndex = [[[subtitleArray objectAtIndex: 1] objectForKey: @"subtitleSourceTrackNum"] intValue]; + /* increment the index of the subtitle menu item by one, to account for Foreign Language Search which is unique to the first track */ + [[subtitleArray objectAtIndex: 1] setObject:[NSNumber numberWithInt:trackOneSelectedIndex + 1] forKey:@"subtitleSourceTrackNum"]; + } + /* now that we have made the adjustment for track one (index 0) go ahead and delete the track */ + [subtitleArray removeObjectAtIndex: rowIndex]; } @@ -346,7 +830,7 @@ container = newContainer; /* now that we have actually selected our track, we can grok the titleOfSelectedItem for that track */ [[subtitleArray objectAtIndex:rowIndex] setObject:[[aTableColumn dataCellForRow:rowIndex] titleOfSelectedItem] forKey:@"subtitleSourceTrackName"]; - } + } else { @@ -370,11 +854,10 @@ container = newContainer; else if ([[aTableColumn identifier] isEqualToString:@"burned"]) { [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackBurned"] intValue]]; - /* Disable the "Burned-In" checkbox if a) the track is "None", b) the subtitle track is text (we do not support burning in - * text subs, or c) we are mp4 and the track is a vobsub (picture sub) */ + /* Disable the "Burned-In" checkbox if a) the track is "None" or b) the subtitle track is text (we do not support burning in + * text subs) */ if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] == 0 || - [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 0 || - (container == HB_MUX_MP4 && [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 1)) + [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 0) { [aCell setEnabled:NO]; } @@ -387,57 +870,67 @@ container = newContainer; { [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackDefault"] intValue]]; } - - } - - BOOL useMp4VobsubDelete = YES; - if (useMp4VobsubDelete == YES) - { - if (container == HB_MUX_MP4) + /* These next three columns only apply to srt's. they are disabled for source subs */ + else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"]) { - /* now remove any other tracks that are set as burned and are picturesubs */ - int i = 0; - int removedTracks = 0; - NSEnumerator *enumerator = [subtitleArray objectEnumerator]; - id tempObject; - NSMutableArray *tempArrayToDelete = [NSMutableArray array]; - BOOL removeTrack = NO; - while ( tempObject = [enumerator nextObject] ) + /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/ + if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"]) { - - if ([[tempObject objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 1) - { - /* if this is the first vobsub mark it. if not, remove it */ - if (removeTrack == NO) - { - /* make sure that this is set to be burned in */ - [tempObject setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"]; - removeTrack = YES; - } - else - { - [tempArrayToDelete addObject:tempObject]; - removedTracks ++; - } - } - - i++; + [aCell setEnabled:YES]; + if([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtLanguageIndex"]) + { + [aCell selectItemAtIndex:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtLanguageIndex"] intValue]]; + } + else + { + [aCell selectItemAtIndex:languagesArrayDefIndex]; // English + [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:languagesArrayDefIndex] forKey:@"subtitleTrackSrtLanguageIndex"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"]; + + } } - /* check to see if there are tracks to remove from the array */ - if ([tempArrayToDelete count] > 0) + else { - /* Popup a warning that hb only support one pic sub being burned in with mp4 */ - int status; - NSBeep(); - status = NSRunAlertPanel(@"More than one vobsub is not supported in an mp4...",@"Your first vobsub track will now be used.", @"OK", nil, nil); - [NSApp requestUserAttention:NSCriticalRequest]; - - [subtitleArray removeObjectsInArray:tempArrayToDelete]; - [aTableView reloadData]; + [aCell setEnabled:NO]; + } + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"]) + { + /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/ + if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"]) + { + [aCell setEnabled:YES]; + if ([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtCharCodeIndex"]) + { + [aCell selectItemAtIndex:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtCharCodeIndex"] intValue]]; + } + else + { + [aCell selectItemAtIndex:charCodeArrayDefIndex]; // ISO-8859-1 + [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCodeIndex"]; + [[subtitleArray objectAtIndex:rowIndex] setObject:[charCodeArray objectAtIndex:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCode"]; + } + } + else + { + [aCell setEnabled:NO]; + } + } + else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"]) + { + if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"]) + { + [aCell setEnabled:YES]; + } + else + { + [aCell setEnabled:NO]; } } + } - + }