aaru-dps/RedBookPlayer
1
0
Fork 0
mirror of https://github.com/aaru-dps/RedBookPlayer.git synced 2025-12-16 19:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify next and previous index logic

Browse Source
This commit is contained in:
Matt Nadareski
2021-06-05 11:35:52 -07:00
parent 09f14810dd
commit bc645c21f0
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RedBookPlayer/Player.cs
View File

@@ -430,21 +430,17 @@ namespace RedBookPlayer
return; return;
} }
if (++CurrentIndex > Image.Tracks[CurrentTrack].Indexes.Keys.Max()) if (CurrentIndex + 1 > Image.Tracks[CurrentTrack].Indexes.Keys.Max())
{ {
if (changeTrack) if (changeTrack)
{ {
NextTrack(); NextTrack();
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[1]; CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes.Values.Min();
}
else
{
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[--CurrentIndex];
} }
} }
else else
{ {
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[CurrentIndex]; CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[++CurrentIndex];
} }
} }
@@ -455,21 +451,17 @@ namespace RedBookPlayer
return; return;
} }
if (CurrentIndex <= 1 || --CurrentIndex < Image.Tracks[CurrentTrack].Indexes.Keys.Min()) if (CurrentIndex - 1 < Image.Tracks[CurrentTrack].Indexes.Keys.Min())
{ {
if (changeTrack) if (changeTrack)
{ {
PreviousTrack(); PreviousTrack();
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes.Values.Max(); CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes.Values.Max();
} }
else
{
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[1];
}
} }
else else
{ {
CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[CurrentIndex]; CurrentSector = (ulong)Image.Tracks[CurrentTrack].Indexes[--CurrentIndex];
} }
} }