Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

ran tabspace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1874 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2013-06-15 13:01:28 +00:00
parent bd49efa5b9
commit 8352262cef
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/AddWareForm.cs
View File

@ -89,7 +89,7 @@ namespace Nikse.SubtitleEdit.Forms
process.PriorityClass = ProcessPriorityClass.BelowNormal;
}
catch
{
{
}
while (!process.HasExited)
{

4
src/Forms/ExportPngXml.cs
View File

@ -593,7 +593,7 @@ $VERSION=1.2
$ULEAD=TRUE
$DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
"NO\tINTIME\t\tOUTTIME\t\tXPOS\tYPOS\tFILENAME\tFADEIN\tFADEOUT";
string dropValue = "30000";
if (comboBoxFramerate.Items[comboBoxFramerate.SelectedIndex].ToString() == "23.98")
dropValue = "23976";
@ -747,7 +747,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
height = 1080;
}
}
private int WriteParagraph(int width, StringBuilder sb, int border, int height, int imagesSavedCount,
VobSubWriter vobSubWriter, FileStream binarySubtitleFile, MakeBitmapParameter param, int i)

10
src/Forms/HardSubExtract.cs
View File

@ -50,7 +50,7 @@ namespace Nikse.SubtitleEdit.Forms
public System.Threading.Mutex mutex;
public CallbackContext(int size)
{
{
framebuf = new MyFrameBuffer(size);
mutex = new System.Threading.Mutex();
}
@ -502,7 +502,7 @@ namespace Nikse.SubtitleEdit.Forms
{
_done = false;
_libVlc.GetNextFrame();
//int vlcState = _libVlc.VlcState;
//while (vlcState != 0 && vlcState != 4)
//{
@ -536,10 +536,10 @@ namespace Nikse.SubtitleEdit.Forms
{
int diff = 0;
factorWidth = prev.Width / lineChecksWidth;
factorHeight = prev.Height / lineChecksHeight;
factorHeight = prev.Height / lineChecksHeight;
for (int yCounter = 0; yCounter < lineChecksHeight; yCounter++)
{
int y = (int)Math.Round(yCounter * factorHeight);
int y = (int)Math.Round(yCounter * factorHeight);
for (int xCounter = 0; xCounter < lineChecksWidth; xCounter++)
{
int x = (int)Math.Round(xCounter * factorWidth);
@ -559,7 +559,7 @@ namespace Nikse.SubtitleEdit.Forms
// Application.DoEvents();
// return;
//}
}
}
}
}
if (diff > maxDiffPixels)

4
src/Forms/Main.cs
View File

@ -2330,7 +2330,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (fileName.ToLower().EndsWith(".dost"))
if (fileName.ToLower().EndsWith(".dost"))
{
var dost = new Dost();
string[] arr = File.ReadAllLines(fileName, Utilities.GetEncodingFromFile(fileName));
@ -13035,7 +13035,7 @@ namespace Nikse.SubtitleEdit.Forms
toolStripMenuItemSpellCheckMain.DropDownItems.Add(item);
syncPluginCount++;
}
}
}
}
catch (Exception exception)
{

4
src/Logic/SubtitleFormats/Dost.cs
View File

@ -34,7 +34,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
if (!sb.ToString().Contains(Environment.NewLine + "NO\tINTIME"))
return false;
if (!sb.ToString().Contains("$FORMAT"))
return false;
return false;
LoadSubtitle(subtitle, lines, fileName);
return subtitle.Paragraphs.Count > _errorCount;
@ -47,7 +47,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public override void LoadSubtitle(Subtitle subtitle, List<string> lines, string fileName)
{
//0001 01:25:59:21 01:26:00:20 0 0 BK02-total_0001.png 0 0
//0001 01:25:59:21 01:26:00:20 0 0 BK02-total_0001.png 0 0
Paragraph p = null;
subtitle.Paragraphs.Clear();
foreach (string line in lines)

6
src/Logic/SubtitleFormats/UnknownSubtitle55.cs
View File

@ -41,7 +41,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public override string ToText(Subtitle subtitle, string title)
{
string format = "{0}: {1} {2} [{3}]";
var sb = new StringBuilder();
var sb = new StringBuilder();
int count = 1;
foreach (Paragraph p in subtitle.Paragraphs)
{
@ -104,7 +104,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
p.StartTime = DecodeTimeCode(parts[1]);
p.EndTime = DecodeTimeCode(parts[2]);
expectStartTime = false;
expectStartTime = false;
}
catch (Exception exception)
{
@ -125,7 +125,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
}
else if (line.Trim().Length > 0 && !expectStartTime)
{
{
p.Text = (p.Text + Environment.NewLine + line).Trim();
if (p.Text.Length > 500)
{

4
src/Logic/SubtitleFormats/UnknownSubtitle56.cs
View File

@ -7,7 +7,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
{
public class UnknownSubtitle56 : SubtitleFormat
{
//0001 01:00:37:22 01:00:39:11
//0001 01:00:37:22 01:00:39:11
static Regex regexTimeCodes1 = new Regex(@"^\d\d\d\d\t\d\d:\d\d:\d\d:\d\d\t\d\d:\d\d:\d\d:\d\d$", RegexOptions.Compiled);
public override string Extension
@ -109,7 +109,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
return;
}
while (p.Text.Contains(Environment.NewLine + " "))
p.Text = p.Text.Replace(Environment.NewLine + " ", Environment.NewLine);
p.Text = p.Text.Replace(Environment.NewLine + " ", Environment.NewLine);
}
}
if (p != null && p.EndTime.TotalMilliseconds > 0)

2
src/Logic/SubtitleFormats/VocapiaSplit.cs
View File

@ -53,7 +53,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
xml.DocumentElement.SelectSingleNode("SpeakerList").InnerXml = speakerListNode.InnerXml;
}
catch
{
{
}
}

2
src/Logic/Utilities.cs
View File

@ -885,7 +885,7 @@ namespace Nikse.SubtitleEdit.Logic
Encoding romanianEncoding = Encoding.GetEncoding(1250); // Romanian
if (GetCount(romanianEncoding.GetString(buffer), "să", "şi", "văzut", "regulă", "găsit", "viaţă") > 99)
return romanianEncoding;
Encoding koreanEncoding = Encoding.GetEncoding(949); // Korean
if (GetCount(koreanEncoding.GetString(buffer), "그리고", "아니야", "하지만", "말이야", "그들은", "우리가") > 5)
return koreanEncoding;

10
src/Logic/VideoPlayers/LibVlcDynamic.cs
View File

@ -547,10 +547,10 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
return null;
}
public bool InitializeAndStartFrameGrabbing(string videoFileName,
UInt32 width, UInt32 height,
LockCallbackDelegate @lock,
UnlockCallbackDelegate unlock,
public bool InitializeAndStartFrameGrabbing(string videoFileName,
UInt32 width, UInt32 height,
LockCallbackDelegate @lock,
UnlockCallbackDelegate unlock,
DisplayCallbackDelegate display,
IntPtr opaque)
{
@ -561,7 +561,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
Directory.SetCurrentDirectory(Path.GetDirectoryName(dllFile));
_libVlcDLL = LoadLibrary(dllFile);
LoadLibVlcDynamic();
string[] initParameters = new string[] { "--no-skip-frames" };
string[] initParameters = new string[] { "--no-skip-frames" };
_libVlc = _libvlc_new(initParameters.Length, initParameters);
IntPtr media = _libvlc_media_new_path(_libVlc, Encoding.UTF8.GetBytes(videoFileName + "\0"));
_mediaPlayer = _libvlc_media_player_new_from_media(media);

2
src/Logic/VideoPlayers/QuartsPlayer.cs
View File

@ -66,7 +66,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
public override double CurrentPosition
{
get
get
{
try
{