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

Fix current index setting, lock reads (fixes #2)

Browse Source
This commit is contained in:
Matt Nadareski
2021-06-05 10:57:20 -07:00
parent 5f9c864c78
commit 09f14810dd
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
RedBookPlayer/Player.cs
View File

@@ -67,7 +67,7 @@ namespace RedBookPlayer
TrackHasEmphasis = ApplyDeEmphasis;
TotalIndexes = Image.Tracks[CurrentTrack].Indexes.Keys.Max();
CurrentIndex = Image.Tracks[CurrentTrack].Indexes.Keys.GetEnumerator().Current;
CurrentIndex = Image.Tracks[CurrentTrack].Indexes.Keys.Min();
}
}
}
@@ -158,7 +158,7 @@ namespace RedBookPlayer
ALSoundOut soundOut;
BiQuadFilter deEmphasisFilterLeft;
BiQuadFilter deEmphasisFilterRight;
bool readingImage = false;
object readingImage = new object();
public async void Init(AaruFormat image, bool autoPlay = false)
{
@@ -278,14 +278,17 @@ namespace RedBookPlayer
Task<byte[]> task = Task.Run(() =>
{
try
lock (readingImage)
{
return Image.ReadSectors(CurrentSector, (uint)sectorsToRead).Concat(zeroSectors).ToArray();
}
catch (System.ArgumentOutOfRangeException)
{
LoadTrack(0);
return Image.ReadSectors(CurrentSector, (uint)sectorsToRead).Concat(zeroSectors).ToArray();
try
{
return Image.ReadSectors(CurrentSector, (uint)sectorsToRead).Concat(zeroSectors).ToArray();
}
catch (System.Exception)
{
LoadTrack(0);
return Image.ReadSectors(CurrentSector, (uint)sectorsToRead).Concat(zeroSectors).ToArray();
}
}
});
@@ -301,11 +304,9 @@ namespace RedBookPlayer
Task.Run(() =>
{
if (!readingImage)
lock (readingImage)
{
readingImage = true;
Image.ReadSector(CurrentSector + 375);
readingImage = false;
}
});