General code style and feature fixes.

This commit is contained in:
2022-11-15 01:35:06 +00:00
parent 47965f0584
commit bd3fe7bd4e
94 changed files with 460 additions and 478 deletions

View File

@@ -93,10 +93,10 @@ public sealed partial class CdrWin
// First line must be SESSION, REM, CATALOG, FILE or CDTEXTFILE.
Match sm = sr.Match(line ?? "");
Match rm = rr.Match(line);
Match cm = cr.Match(line);
Match fm = fr.Match(line);
Match tm = tr.Match(line);
Match rm = rr.Match(line ?? "");
Match cm = cr.Match(line ?? "");
Match fm = fr.Match(line ?? "");
Match tm = tr.Match(line ?? "");
return sm.Success || rm.Success || cm.Success || fm.Success || tm.Success;
}

View File

@@ -282,8 +282,7 @@ public sealed partial class CdrWin
AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DUMP EXTENT at line {0}",
lineNumber);
if(DumpHardware is null)
DumpHardware = new List<DumpHardwareType>();
DumpHardware ??= new List<DumpHardwareType>();
DumpHardwareType existingDump =
DumpHardware.FirstOrDefault(d =>
@@ -2253,11 +2252,10 @@ public sealed partial class CdrWin
_imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
var br = new BinaryReader(_imageStream);
br.BaseStream.
Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
SeekOrigin.Begin);
br.BaseStream.Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorSize + sectorSkip)),
SeekOrigin.Begin);
if(sectorOffset == 0 &&
if(
sectorSkip == 0)
buffer = br.ReadBytes((int)(sectorSize * length));
else

View File

@@ -53,7 +53,7 @@ public sealed partial class CdrWin
public string FileType;
}
class CdrWinTrack
sealed class CdrWinTrack
{
/// <summary>Track arranger (from CD-Text)</summary>
public string Arranger;