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

Fix setting indexes from track start and pregap in aaruformat.

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-21 01:54:30 +01:00
parent c80baa5efb
commit 0efa8e3846
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Aaru.Images/AaruFormat/Read.cs
View File

@@ -1079,6 +1079,26 @@ namespace Aaru.DiscImages
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
foreach(Track track in Tracks.OrderBy(t => t.TrackStartSector))
{
if(track.TrackSequence == 1)
{
track.TrackPregap = 150;
track.Indexes[0] = -150;
track.Indexes[1] = (int)track.TrackStartSector;
continue;
}
if(track.TrackPregap > 0)
{
track.Indexes[0] = (int)track.TrackStartSector;
track.Indexes[1] = (int)(track.TrackStartSector + track.TrackPregap);
}
else
track.Indexes[1] = (int)track.TrackStartSector;
}
ulong currentTrackOffset = 0;
Partitions = new List<Partition>();
@@ -1086,11 +1106,12 @@ namespace Aaru.DiscImages
{
Partitions.Add(new Partition
{
Sequence = track.TrackSequence, Type = track.TrackType.ToString(),
Name = $"Track {track.TrackSequence}", Offset = currentTrackOffset,
Start = track.TrackStartSector,
Size = ((track.TrackEndSector - track.TrackStartSector) + 1) * (ulong)track.TrackBytesPerSector,
Length = (track.TrackEndSector - track.TrackStartSector) + 1, Scheme = "Optical disc track"
Sequence = track.TrackSequence, Type = track.TrackType.ToString(),
Name = $"Track {track.TrackSequence}", Offset = currentTrackOffset,
Start = (ulong)track.Indexes[1],
Size = ((track.TrackEndSector - (ulong)track.Indexes[1]) + 1) *
(ulong)track.TrackBytesPerSector,
Length = (track.TrackEndSector - (ulong)track.Indexes[1]) + 1, Scheme = "Optical disc track"
});
currentTrackOffset += ((track.TrackEndSector - track.TrackStartSector) + 1) *