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

Use same processing for PREGAP than for INDEX 00 in CDRWin disc images. Fixes #510

Browse Source
This commit is contained in:
Natalia Portillo
2021-06-07 22:28:13 +01:00
parent afaacd20e8
commit 617cc92c5f
1 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Aaru.Images/CDRWin/Read.cs
View File

@@ -738,11 +738,45 @@ namespace Aaru.DiscImages
{ {
AaruConsole.DebugWriteLine("CDRWin plugin", "Found PREGAP at line {0}", lineNumber); AaruConsole.DebugWriteLine("CDRWin plugin", "Found PREGAP at line {0}", lineNumber);
if(inTrack) if(!inTrack)
currentTrack.Pregap = CdrWinMsfToLba(matchPregap.Groups[1].Value);
else
throw new throw new
FeatureUnsupportedImageException($"Found PREGAP field before a track at line {lineNumber}"); FeatureUnsupportedImageException($"Found PREGAP field before a track at line {lineNumber}");
int offset = CdrWinMsfToLba(matchPregap.Groups[1].Value);
if((int)(currentTrack.Sequence - 2) >= 0 &&
offset > 1)
{
cueTracks[currentTrack.Sequence - 2].Sectors =
(ulong)(offset - (int)currentFileOffsetSector);
currentFile.Offset += cueTracks[currentTrack.Sequence - 2].Sectors *
cueTracks[currentTrack.Sequence - 2].Bps;
AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
currentFile.Offset);
AaruConsole.DebugWriteLine("CDRWin plugin",
"cueTracks[currentTrack.sequence-2].sectors = {0}",
cueTracks[currentTrack.Sequence - 2].Sectors);
AaruConsole.DebugWriteLine("CDRWin plugin",
"cueTracks[currentTrack.sequence-2].bps = {0}",
cueTracks[currentTrack.Sequence - 2].Bps);
}
if(currentTrack.Sequence == 1)
{
AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
offset * currentTrack.Bps);
currentFile.Offset = (ulong)(offset * currentTrack.Bps);
}
if(currentTrack.Indexes.Count == 0)
currentFileOffsetSector = offset;
currentTrack.Indexes.Add(0, offset);
} }
else if(matchSongWriter.Success) else if(matchSongWriter.Success)
{ {