mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Merge pull request #2113 from ivandrofly/timecode
[TimeCode] - Update/Fix.
This commit is contained in:
commit
d28b1aaf38
@ -87,7 +87,7 @@ namespace Nikse.SubtitleEdit.Core
|
|||||||
set
|
set
|
||||||
{
|
{
|
||||||
var ts = TimeSpan;
|
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
|
set
|
||||||
{
|
{
|
||||||
var ts = TimeSpan;
|
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
|
set
|
||||||
{
|
{
|
||||||
var ts = TimeSpan;
|
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
|
set
|
||||||
{
|
{
|
||||||
var ts = TimeSpan;
|
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()
|
public string ToShortStringHHMMSSFF()
|
||||||
{
|
{
|
||||||
string s = ToHHMMSSFF();
|
string s = ToHHMMSSFF();
|
||||||
|
int j = 0;
|
||||||
if (s.StartsWith("0:00:", StringComparison.Ordinal))
|
if (s.StartsWith("0:00:", StringComparison.Ordinal))
|
||||||
s = s.Remove(0, 5);
|
j = 5;
|
||||||
if (s.StartsWith("00:", StringComparison.Ordinal))
|
if (s.StartsWith("00:", StringComparison.Ordinal))
|
||||||
s = s.Remove(0, 3);
|
j += 3;
|
||||||
if (s.StartsWith("00:", StringComparison.Ordinal))
|
if (s.StartsWith("00:", StringComparison.Ordinal))
|
||||||
s = s.Remove(0, 3);
|
j += 3;
|
||||||
return s;
|
return j > 0 ? s.Substring(j) : s;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string ToHHMMSSFF()
|
public string ToHHMMSSFF()
|
||||||
|
@ -70,6 +70,19 @@ namespace Test.Logic
|
|||||||
Assert.AreEqual(tc.TotalMilliseconds, 2000);
|
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]
|
[TestMethod]
|
||||||
public void TimeCodeMilliseconds()
|
public void TimeCodeMilliseconds()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user