Skip to content

Commit

Permalink
SE 3.3.12
Browse files Browse the repository at this point in the history 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2367 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
  • Loading branch information
@niksedk
niksedk committed Jan 12, 2014
1 parent 1217296 commit c28dfff
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 21 deletions.
25 changes: 22 additions & 3 deletions Dictionaries/da_DK_names_etc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,34 @@
<name>Aquarium</name>
<name>Armfeldt</name>
<name>Asgård</name>
<name>Bäckström</name>
<name>Bahnhofstrasse</name>
<name>Bartok</name>
<name>Beaudine</name>
<name>Beyonces</name>
<name>Brahms</name>
<name>Bäckström</name>
<name>Cartier</name>
<name>Cavanaughs</name>
<name>Chardonnay</name>
<name>Chewy</name>
<name>Chopin</name>
<name>Chopins</name>
<name>Chung</name>
<name>Corolla</name>
<name>Danmark</name>
<name>Devaney</name>
<name>Diagonalstræde</name>
<name>Dickens</name>
<name>DiLaurentis</name>
<name>Egerman</name>
<name>England</name>
<name>Falcon</name>
<name>Falconberg</name>
<name>Fields</name>
<name>Frankrig</name>
<name>Fulton</name>
<name>Fultons</name>
<name>Gatsby</name>
<name>Geographic</name>
<name>Gerimax</name>
<name>Guangdong</name>
Expand All @@ -26,23 +38,27 @@
<name>Inc.</name>
<name>Italien</name>
<name>Juliard</name>
<name>Kahn</name>
<name>Karlsson</name>
<name>København</name>
<name>Kretzinsky</name>
<name>København</name>
<name>Leningrad</name>
<name>Lyman</name>
<name>Lymans</name>
<name>Magnoliavej</name>
<name>Mandelbaum</name>
<name>Mandelbaums</name>
<name>MBA</name>
<name>McClellan</name>
<name>Mellisas</name>
<name>Monterey</name>
<name>Nadjim</name>
<name>Østrig</name>
<name>Neumann</name>
<name>Petterson</name>
<name>Pransky</name>
<name>Primulavænget</name>
<name>Puttanesca</name>
<name>Rosewood</name>
<name>Schumanns</name>
<name>Sheng</name>
<name>Silverton</name>
Expand All @@ -56,5 +72,8 @@
<name>Uzés</name>
<name>Waldstein</name>
<name>Waterman</name>
<name>Wharton</name>
<name>Wylie</name>
<name>Yardley</name>
<name>Østrig</name>
</ignore_words>
33 changes: 33 additions & 0 deletions Dictionaries/dan_OCRFixReplaceList.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,39 @@
<Word from="10O" to="100" />
<Word from="besluttedejeg" to="besluttede jeg" />
<Word from="varsket" to="var sket" />
<Word from="harjetlag" to="har jetlag" />
<Word from="lkke" to="Ikke" />
<Word from="lntet" to="Intet" />
<Word from="afslørerjeg" to="afslører jeg" />
<Word from="måjeg" to="må jeg" />
<Word from="Vl" to="VI" />
<Word from="atbygge" to="at bygge" />
<Word from="detmakabre" to="det makabre" />
<Word from="vilikke" to="vil ikke" />
<Word from="talsmandbekræfter" to="talsmand bekræfter" />
<Word from="vedatrenovere" to="ved at renovere" />
<Word from="forsøgeratforstå" to="forsøger at forstå" />
<Word from="ersket" to="er sket" />
<Word from="morderpå" to="morder på" />
<Word from="frifodiRosewood" to="fri fod i Rosewood" />
<Word from="holdtpressemøde" to="holdt pressemøde" />
<Word from="lngen" to="Ingen" />
<Word from="lND" to="IND" />
<Word from="henterjeg" to="henter jeg" />
<Word from="lsabel" to="Isabel" />
<Word from="lsabels" to="Isabels" />
<Word from="vinderjo" to="vinder jo" />
<Word from="rødmerjo" to="rødmer jo" />
<Word from="etjakkesæt" to="et jakkesæt" />
<Word from="glæderjeg" to="glæder jeg" />
<Word from="lgen" to="Igen" />
<Word from="lsær" to="Især" />
<Word from="iparken" to="i parken" />
<Word from="nårl" to="når I" />
<Word from="tilA1" to="til A1" />
<Word from="FBl" to="FBI" />
<Word from="viljo" to="vil jo" />
<Word from="detpå" to="det på" />
</WholeWords>
<PartialWordsAlways>
<WordPart from="¤" to="o" />
Expand Down
12 changes: 10 additions & 2 deletions Dictionaries/en_US_names_etc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<name>Emilie</name>
<name>Engelbert</name>
<name>Enya</name>
<name>Erebor</name>
<name>Eschnapur</name>
<name>Evadne</name>
<name>Falco</name>
Expand All @@ -131,6 +132,7 @@
<name>French Polynesia</name>
<name>French Southern Territories</name>
<name>Frida</name>
<name>Froot Loops</name>
<name>Furneaux</name>
<name>Gabor</name>
<name>Galliard</name>
Expand Down Expand Up @@ -223,7 +225,6 @@
<name>Kuwabara-san</name>
<name>Kuwa-chan</name>
<name>Lachlan</name>
<name>Lærke</name>
<name>Langford</name>
<name>Lansberry</name>
<name>Laurits</name>
Expand All @@ -239,8 +240,8 @@
<name>Luca</name>
<name>Luka</name>
<name>Lukas</name>
<name>Lærke</name>
<name>M&amp;M</name>
<name>Maasai</name>
<name>MacArthur</name>
<name>MacDonald</name>
<name>MacKenzie</name>
Expand Down Expand Up @@ -280,13 +281,15 @@
<name>Mikkel</name>
<name>Mille</name>
<name>Minamino</name>
<name>Minogue</name>
<name>Mischa</name>
<name>Mjolnir</name>
<name>Moesha</name>
<name>Mor'du</name>
<name>Mosaddegh</name>
<name>Moulin Rouge</name>
<name>Mousson</name>
<name>Maasai</name>
<name>Nadeshiko</name>
<name>Neuschwanstein</name>
<name>New Hampshire</name>
Expand All @@ -296,11 +299,13 @@
<name>Nova Scotia</name>
<name>Nussbaum</name>
<name>Nutella</name>
<name>Oakenshield</name>
<name>Oeufcocque Penteano</name>
<name>Oeufcocque-Penteano</name>
<name>Ogilvie</name>
<name>Okubo</name>
<name>Oleg</name>
<name>Oliveira</name>
<name>Olsson</name>
<name>OMG</name>
<name>Omni</name>
Expand All @@ -312,6 +317,7 @@
<name>Pettersson</name>
<name>Phineas</name>
<name>Pinella</name>
<name>Poindexter</name>
<name>Pont Neuf</name>
<name>Pozarsky</name>
<name>Praetorians</name>
Expand All @@ -320,6 +326,7 @@
<name>Purvis</name>
<name>Pycroft</name>
<name>Quintus</name>
<name>Rafferty</name>
<name>Ralf</name>
<name>Ramigani</name>
<name>Rasmus</name>
Expand Down Expand Up @@ -373,6 +380,7 @@
<name>Skarsgård</name>
<name>Skokie</name>
<name>Skunk Anansie</name>
<name>Smaug</name>
<name>Smithers</name>
<name>Snuffy</name>
<name>Spectravision</name>
Expand Down
4 changes: 2 additions & 2 deletions src/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Subtitle Edit Changelog

3.3.12 (xth January 2013)
3.3.12 (12th January 2013)
* NEW:
* Added initial support for importing DVB subtitles from transport streams
* Added "File -> Import images"
* Added "Tools -> Merge lines with same text"
* Importing from plain text file, "One line is one subtitle" now has a
"Line break" option - thx Adrian
* Added initial support for importing DVB subtitles from transport streams
* Added xml subtitle format "FLVCoreCuePoints" - thx Jon
* Added some support for fxpxml 1.3
* Added link to Sinhala spell check dictionary
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/TransportStreamSubtitleChooser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void listBoxSubtitles_SelectedIndexChanged(object sender, EventArgs e)
int pid = _tsParser.SubtitlePacketIds[listBoxTracks.SelectedIndex];
var list = _tsParser.GetDvbSubtitles(pid);

var dvbBmp = list[idx].Pes.GetImageFull();
var dvbBmp = list[idx].GetActiveImage();
var nDvbBmp = new NikseBitmap(dvbBmp);
nDvbBmp.CropTopTransparent(2);
nDvbBmp.CropTransparentSidesAndBottom(2, true);
Expand Down
31 changes: 18 additions & 13 deletions src/Logic/TransportStream/TransportStreamParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public void ParseTsFile(Stream ms)
if (IsM2TransportStream)
{
ms.Read(m2tsTimeCodeBuffer, 0, m2tsTimeCodeBuffer.Length);
//var tc = Helper.GetEndianWord(m2tsTimeCodeBuffer, 0);
//System.Windows.Forms.MessageBox.Show("Test" + tc);
var tc = (m2tsTimeCodeBuffer[0]<< 24) | (m2tsTimeCodeBuffer[1] << 16) | (m2tsTimeCodeBuffer[2] << 8) | (m2tsTimeCodeBuffer[3]);
position += m2tsTimeCodeBuffer.Length;
}

Expand Down Expand Up @@ -149,24 +148,30 @@ public void ParseTsFile(Stream ms)
if (IsM2TransportStream)
{
DvbSubtitlesLookup = new Dictionary<int, List<TransportStreamSubtitle>>();
SubtitlesLookup = new Dictionary<int, List<DvbSubPes>>();
foreach (int pid in SubtitlePacketIds)
{
var bdMs = new MemoryStream();
var list = MakeSubtitlePesPackets(pid);
//var startMsList = new List<ulong>();
//var endMsList = new List<ulong>();
var startMsList = new List<ulong>();
var endMsList = new List<ulong>();
foreach (var item in list)
{
bdMs.Write(item.DataBuffer, 0, item.DataBuffer.Length);
//if (item.DataBuffer[0] == 0x16)
//{
// startMsList.Add(item.PresentationTimeStampToMilliseconds() / 90);
//}
if (item.DataBuffer[0] == 0x16)
{
if (startMsList.Count <= endMsList.Count)
startMsList.Add(item.PresentationTimeStampToMilliseconds());
else
endMsList.Add(item.PresentationTimeStampToMilliseconds());
}
//else if (item.DataBuffer[0] == 0x80)
//{
//{ //TODO Load bd sub after 0x80, so we can be sure to get correct time code???
// endMsList.Add(item.PresentationTimeStampToMilliseconds() / 90);
//}
}
SubtitlesLookup.Add(pid, list);

bdMs.Position = 0;
var sb = new StringBuilder();
var bdList = BluRaySupParser.ParseBluRaySup(bdMs, sb, true);
Expand All @@ -177,11 +182,11 @@ public void ParseTsFile(Stream ms)
{
var bdSup = bdList[k];
ulong startMs = 0;
//if (k < startMsList.Count)
// startMs = startMsList[k];
if (k < startMsList.Count)
startMs = startMsList[k];
ulong endMs = 0;
//if (k < endMsList.Count)
// endMs = endMsList[k];
if (k < endMsList.Count)
endMs = endMsList[k];
subList.Add(new TransportStreamSubtitle(bdSup, startMs, endMs));
}
DvbSubtitlesLookup.Add(pid, subList);
Expand Down

0 comments on commit c28dfff

Please sign in to comment.