ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

subtitles: proper internal sorting

This commit is contained in:
feos 2016-06-30 19:14:12 +03:00
parent df45b49f91
commit fbbc97731e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Client.Common/movie/SubtitleList.cs
View File

@ -24,6 +24,7 @@ namespace BizHawk.Client.Common
public override string ToString() public override string ToString()
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
this.Sort();
ForEach(subtitle => sb.AppendLine(subtitle.ToString())); ForEach(subtitle => sb.AppendLine(subtitle.ToString()));
return sb.ToString(); return sb.ToString();
} }
@ -64,13 +65,13 @@ namespace BizHawk.Client.Common
return false; return false;
} }
public new SubtitleList Sort() public new void Sort()
{ {
List<Subtitle> subs = this.OrderBy(s => s.Frame).ThenBy(s => s.Y).ToList(); this.Sort((x, y) =>
SubtitleList ret = new SubtitleList(); {
foreach (var subtitle in subs) int result = x.Frame.CompareTo(y.Frame);
ret.Add(subtitle); return result != 0 ? result : x.Y.CompareTo(y.Y);
return ret; });
} }
public string ToSubRip(double fps) public string ToSubRip(double fps)

2
BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -97,7 +97,7 @@ namespace BizHawk.Client.Common
Subtitles.AddFromString(line); Subtitles.AddFromString(line);
} }
} }
Subtitles = Subtitles.Sort(); Subtitles.Sort();
}); });
} }