Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1741 from xylographe/rfct

Browse Source 
Minor refact
This commit is contained in:
Nikolaj Olsson 2016-05-03 21:14:06 +02:00
commit 7e51245984
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libse/ContainerFormats/RiffParser.cs
View File

@ -409,7 +409,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
public static string FromFourCC(int FourCC) public static string FromFourCC(int FourCC)
{ {
char[] chars = new char[4]; var chars = new char[4];
chars[0] = (char)(FourCC & 0xFF); chars[0] = (char)(FourCC & 0xFF);
chars[1] = (char)((FourCC >> 8) & 0xFF); chars[1] = (char)((FourCC >> 8) & 0xFF);
chars[2] = (char)((FourCC >> 16) & 0xFF); chars[2] = (char)((FourCC >> 16) & 0xFF);

2
libse/Forms/RemoveTextForHISettings.cs
View File

@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
ColonSeparateLine = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyOnSeparateLine; ColonSeparateLine = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyOnSeparateLine;
RemoveWhereContains = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains; RemoveWhereContains = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains;
RemoveIfTextContains = new List<string>(); RemoveIfTextContains = new List<string>();
foreach (string item in Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string item in Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
{ {
RemoveIfTextContains.Add(item.Trim()); RemoveIfTextContains.Add(item.Trim());
} }

2
libse/SubtitleFormats/DCSubtitle.cs
View File

@ -666,7 +666,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private static TimeCode GetTimeCode(string s) private static TimeCode GetTimeCode(string s)
{ {
string[] parts = s.Split(new char[] { ':', '.', ',' }); var parts = s.Split(new[] { ':', '.', ',' });
int milliseconds = (int)(int.Parse(parts[3]) * 4); // 000 to 249 int milliseconds = (int)(int.Parse(parts[3]) * 4); // 000 to 249
if (s.Contains('.')) if (s.Contains('.'))

2
libse/SubtitleFormats/DCinemaSmpte2007.cs
View File

@ -713,7 +713,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private TimeCode GetTimeCode(string s) private TimeCode GetTimeCode(string s)
{ {
string[] parts = s.Split(new char[] { ':', '.', ',' }); var parts = s.Split(new[] { ':', '.', ',' });
int milliseconds = (int)Math.Round(int.Parse(parts[3]) * (TimeCode.BaseUnit / _frameRate)); int milliseconds = (int)Math.Round(int.Parse(parts[3]) * (TimeCode.BaseUnit / _frameRate));
if (milliseconds > 999) if (milliseconds > 999)

2
libse/SubtitleFormats/DCinemaSmpte2010.cs
View File

@ -713,7 +713,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private TimeCode GetTimeCode(string s) private TimeCode GetTimeCode(string s)
{ {
string[] parts = s.Split(new char[] { ':', '.', ',' }); var parts = s.Split(new[] { ':', '.', ',' });
int milliseconds = (int)Math.Round(int.Parse(parts[3]) * (TimeCode.BaseUnit / _frameRate)); int milliseconds = (int)Math.Round(int.Parse(parts[3]) * (TimeCode.BaseUnit / _frameRate));
if (milliseconds > 999) if (milliseconds > 999)

2
libse/SubtitleFormats/FlashXml.cs
View File

@ -179,7 +179,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
s = s.TrimEnd('s'); s = s.TrimEnd('s');
return TimeCode.FromSeconds(double.Parse(s)); return TimeCode.FromSeconds(double.Parse(s));
} }
string[] parts = s.Split(new char[] { ':', '.', ',' }); var parts = s.Split(new[] { ':', '.', ',' });
return new TimeCode(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3])); return new TimeCode(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
} }

6
libse/SubtitleFormats/SeImageHtmlIndex.cs
View File

@ -55,13 +55,13 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{ {
var s = line.Replace("&gt;", ">").Substring(0, idx); var s = line.Replace("&gt;", ">").Substring(0, idx);
s = s.Remove(0, s.IndexOf(':') + 1); s = s.Remove(0, s.IndexOf(':') + 1);
var arr = s.Split(new char[] { '-', '>' }, StringSplitOptions.RemoveEmptyEntries); var arr = s.Split(new[] { '-', '>' }, StringSplitOptions.RemoveEmptyEntries);
var p = new Paragraph(); var p = new Paragraph();
p.StartTime = DecodeTimeCode(arr[0]); p.StartTime = DecodeTimeCode(arr[0]);
p.EndTime = DecodeTimeCode(arr[1]); p.EndTime = DecodeTimeCode(arr[1]);
int start = line.IndexOf("<img src=") + 9; int start = line.IndexOf("<img src=") + 9;
int end = line.IndexOf(".png") + 4; int end = line.IndexOf(".png") + 4;
p.Text = (line.Substring(start, end - start)).Trim(new char[] { '"', '\'' }); p.Text = line.Substring(start, end - start).Trim(new[] { '"', '\'' });
subtitle.Paragraphs.Add(p); subtitle.Paragraphs.Add(p);
} }
@ -77,7 +77,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private TimeCode DecodeTimeCode(string timeCode) private TimeCode DecodeTimeCode(string timeCode)
{ {
var parts = timeCode.Split(new char[] { ':', '-', '>', ',', '.' }, StringSplitOptions.RemoveEmptyEntries); var parts = timeCode.Split(new[] { ':', '-', '>', ',', '.' }, StringSplitOptions.RemoveEmptyEntries);
int milliseconds = int.Parse(parts[parts.Length - 1]); int milliseconds = int.Parse(parts[parts.Length - 1]);
int seconds = int.Parse(parts[parts.Length - 2]); int seconds = int.Parse(parts[parts.Length - 2]);
int minutes = 0; int minutes = 0;

8
src/Forms/Styles/SubStationAlphaStyles.cs
View File

@ -821,8 +821,8 @@ namespace Nikse.SubtitleEdit.Forms.Styles
if (_isSubStationAlpha) if (_isSubStationAlpha)
{ {
var ssa = new SubStationAlpha(); var ssa = new SubStationAlpha();
string text = ssa.ToText(sub, string.Empty); var text = ssa.ToText(sub, string.Empty);
string[] lineArray = text.Split(new string[] { Environment.NewLine }, StringSplitOptions.None); var lineArray = text.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
var lines = new List<string>(); var lines = new List<string>();
foreach (string line in lineArray) foreach (string line in lineArray)
lines.Add(line); lines.Add(line);
@ -832,8 +832,8 @@ namespace Nikse.SubtitleEdit.Forms.Styles
else else
{ {
var ass = new AdvancedSubStationAlpha(); var ass = new AdvancedSubStationAlpha();
string text = ass.ToText(sub, string.Empty); var text = ass.ToText(sub, string.Empty);
string[] lineArray = text.Split(new string[] { Environment.NewLine }, StringSplitOptions.None); var lineArray = text.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
var lines = new List<string>(); var lines = new List<string>();
foreach (string line in lineArray) foreach (string line in lineArray)
lines.Add(line); lines.Add(line);