Minor fix for FAB image script export

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@989 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-02-12 15:50:46 +00:00
parent 661187be1b
commit 859c0c1fbe
2 changed files with 7 additions and 3 deletions

View File

@ -5,6 +5,7 @@ Subtitle Edit Changelog
* Arabic language file - thx Zakaria Farah Abu Wael
* Export to VobSub format
* Added new subtitle formats (now more than 80!)
* Added export to FAB image script
* IMPROVED:
* Updated Basque languaged file - thx Xabier Aramendi
* Export images alignment - thx Marcin

View File

@ -349,7 +349,7 @@ namespace Nikse.SubtitleEdit.Forms
//RACE001.TIF 00;00;02;02 00;00;03;15 000 000 720 480
//RACE002.TIF 00;00;05;18 00;00;09;20 000 000 720 480
int top = param.ScreenHeight - (param.Bitmap.Height + 20); // bottom margin=20
sb.AppendLine(string.Format("{0} {1} {2} {3} {4} {5} {6}", Path.GetFileName(fileName), FormatFabTime(param.P.StartTime), FormatFabTime(param.P.EndTime), 0, top, param.ScreenWidth, param.ScreenHeight));
sb.AppendLine(string.Format("{0} {1} {2} {3} {4} {5} {6}", Path.GetFileName(fileName), FormatFabTime(param.P.StartTime, param), FormatFabTime(param.P.EndTime, param), 0, top, param.ScreenWidth, param.ScreenHeight));
param.Saved = true;
}
}
@ -380,9 +380,12 @@ namespace Nikse.SubtitleEdit.Forms
return imagesSavedCount;
}
private string FormatFabTime(TimeCode time)
private string FormatFabTime(TimeCode time, MakeBitmapParameter param)
{
return string.Format("{0:00};{1:00};{2:00};{3:00}", time.Hours, time.Minutes, time.Seconds, Nikse.SubtitleEdit.Logic.SubtitleFormats.SubtitleFormat.MillisecondsToFrames(time.Milliseconds));
if (param.Bitmap.Width == 720 && param.Bitmap.Width == 480) // NTSC
return string.Format("{0:00};{1:00};{2:00};{3:00}", time.Hours, time.Minutes, time.Seconds, Nikse.SubtitleEdit.Logic.SubtitleFormats.SubtitleFormat.MillisecondsToFrames(time.Milliseconds));
else
return string.Format("{0:00}:{1:00}:{2:00}:{3:00}", time.Hours, time.Minutes, time.Seconds, Nikse.SubtitleEdit.Logic.SubtitleFormats.SubtitleFormat.MillisecondsToFrames(time.Milliseconds));
}
private void SetupImageParameters()