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

Merge pull request #2113 from ivandrofly/timecode

Browse Source 
[TimeCode] - Update/Fix.
This commit is contained in:
Nikolaj Olsson 2016-11-27 21:13:33 +01:00 committed by GitHub
commit d28b1aaf38
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libse/TimeCode.cs
View File

@ -87,7 +87,7 @@ namespace Nikse.SubtitleEdit.Core
set
{
var ts = TimeSpan;
_totalMilliseconds = new TimeSpan(0, value, ts.Minutes, ts.Seconds, ts.Milliseconds).TotalMilliseconds;
_totalMilliseconds = new TimeSpan(ts.Days, value, ts.Minutes, ts.Seconds, ts.Milliseconds).TotalMilliseconds;
}
}
@ -100,7 +100,7 @@ namespace Nikse.SubtitleEdit.Core
set
{
var ts = TimeSpan;
_totalMilliseconds = new TimeSpan(0, ts.Hours, value, ts.Seconds, ts.Milliseconds).TotalMilliseconds;
_totalMilliseconds = new TimeSpan(ts.Days, ts.Hours, value, ts.Seconds, ts.Milliseconds).TotalMilliseconds;
}
}
@ -113,7 +113,7 @@ namespace Nikse.SubtitleEdit.Core
set
{
var ts = TimeSpan;
_totalMilliseconds = new TimeSpan(0, ts.Hours, ts.Minutes, value, ts.Milliseconds).TotalMilliseconds;
_totalMilliseconds = new TimeSpan(ts.Days, ts.Hours, ts.Minutes, value, ts.Milliseconds).TotalMilliseconds;
}
}
@ -126,7 +126,7 @@ namespace Nikse.SubtitleEdit.Core
set
{
var ts = TimeSpan;
_totalMilliseconds = new TimeSpan(0, ts.Hours, ts.Minutes, ts.Seconds, value).TotalMilliseconds;
_totalMilliseconds = new TimeSpan(ts.Days, ts.Hours, ts.Minutes, ts.Seconds, value).TotalMilliseconds;
}
}
@ -213,13 +213,14 @@ namespace Nikse.SubtitleEdit.Core
public string ToShortStringHHMMSSFF()
{
string s = ToHHMMSSFF();
int j = 0;
if (s.StartsWith("0:00:", StringComparison.Ordinal))
s = s.Remove(0, 5);
j = 5;
if (s.StartsWith("00:", StringComparison.Ordinal))
s = s.Remove(0, 3);
j += 3;
if (s.StartsWith("00:", StringComparison.Ordinal))
s = s.Remove(0, 3);
return s;
j += 3;
return j > 0 ? s.Substring(j) : s;
}
public string ToHHMMSSFF()

13
src/Test/Logic/TimeCodeTest.cs
View File

@ -70,6 +70,19 @@ namespace Test.Logic
Assert.AreEqual(tc.TotalMilliseconds, 2000);
}
[TestMethod]
public void TimeCodeDaysTest()
{
var tc = new TimeCode(24 * 3, 0, 0, 0)
{
Hours = 0,
Minutes = 0,
Seconds = 0,
Milliseconds = 0,
};
Assert.IsTrue(tc.TotalMilliseconds > 0);
}
[TestMethod]
public void TimeCodeMilliseconds()
{