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

Simplify some struct type names.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-14 21:18:28 +01:00
parent 9dc57c2bd8
commit cd41c8e59a
56 changed files with 2111 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
View File

@@ -140,8 +140,8 @@ namespace Aaru.Core.Devices.Dumping
PulseProgress?.Invoke($"Trimming sector {badSector}");
Track track = tracks.OrderBy(t => t.TrackStartSector).
LastOrDefault(t => badSector >= t.TrackStartSector);
Track track = tracks.OrderBy(t => t.StartSector).
LastOrDefault(t => badSector >= t.StartSector);
byte sectorsToTrim = 1;
uint badSectorToRead = (uint)badSector;
@@ -266,10 +266,10 @@ namespace Aaru.Core.Devices.Dumping
else
_outputPlugin.WriteSector(Sector.GetUserData(data), badSector);
ulong trkStartBefore = track.TrackStartSector;
ulong trkStartBefore = track.StartSector;
bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.TrackSequence, ref mcn,
desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence, ref mcn,
tracks, subchannelExtents, _fixSubchannelPosition, _outputPlugin, _fixSubchannel,
_fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
@@ -279,10 +279,10 @@ namespace Aaru.Core.Devices.Dumping
(_outputPlugin as IWritableOpticalImage).SetTracks(tracks.ToList());
if(track.TrackStartSector != trkStartBefore &&
!_resume.BadBlocks.Contains(track.TrackStartSector))
if(track.StartSector != trkStartBefore &&
!_resume.BadBlocks.Contains(track.StartSector))
{
_resume.BadBlocks.Add(track.TrackStartSector);
_resume.BadBlocks.Add(track.StartSector);
goto trimStart;
}