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

[Refactor] Merge into logical patterns.

Browse Source
This commit is contained in:
Natalia Portillo
2024-05-01 17:46:53 +01:00
parent b75fcf0f41
commit c58d4a4d41
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Filesystems/CBM/CBM.cs
View File

@@ -99,7 +99,7 @@ public sealed partial class CBM : IReadOnlyFilesystem
ulong CbmChsToLba(byte track, byte sector, bool is1581)
{
if(track == 0 || track > 40) return 0;
if(track is 0 or > 40) return 0;
if(is1581) return (ulong)((track - 1) * 40 + sector - 1);

40
Aaru.Images/AaruFormat/Write.cs
View File

@@ -1926,8 +1926,9 @@ public sealed partial class AaruFormat
// Fill FLAC block
if(remaining != 0)
for(var r = 0; r < remaining * 4; r++)
_writingBuffer[_writingBufferPosition + r] = 0;
{
for(var r = 0; r < remaining * 4; r++) _writingBuffer[_writingBufferPosition + r] = 0;
}
compressedLength = FLAC.EncodeBuffer(_writingBuffer,
_compressedBuffer,
@@ -2126,21 +2127,21 @@ public sealed partial class AaruFormat
if(track.Sequence == 0 && track.StartSector == 0 && track.EndSector == 0) track.Type = TrackType.Data;
if(data.Length == 2064 &&
(_imageInfo.MediaType == MediaType.DVDROM ||
_imageInfo.MediaType == MediaType.PS2DVD ||
_imageInfo.MediaType == MediaType.SACD ||
_imageInfo.MediaType == MediaType.PS3DVD ||
_imageInfo.MediaType == MediaType.DVDR ||
_imageInfo.MediaType == MediaType.DVDRW ||
_imageInfo.MediaType == MediaType.DVDPR ||
_imageInfo.MediaType == MediaType.DVDPRW ||
_imageInfo.MediaType == MediaType.DVDPRWDL ||
_imageInfo.MediaType == MediaType.DVDRDL ||
_imageInfo.MediaType == MediaType.DVDPRDL ||
_imageInfo.MediaType == MediaType.DVDRAM ||
_imageInfo.MediaType == MediaType.DVDRWDL ||
_imageInfo.MediaType == MediaType.DVDDownload ||
_imageInfo.MediaType == MediaType.Nuon))
_imageInfo.MediaType is MediaType.DVDROM
or MediaType.PS2DVD
or MediaType.SACD
or MediaType.PS3DVD
or MediaType.DVDR
or MediaType.DVDRW
or MediaType.DVDPR
or MediaType.DVDPRW
or MediaType.DVDPRWDL
or MediaType.DVDRDL
or MediaType.DVDPRDL
or MediaType.DVDRAM
or MediaType.DVDRWDL
or MediaType.DVDDownload
or MediaType.Nuon)
{
sector = new byte[2048];
_sectorId ??= new byte[_imageInfo.Sectors * 4];
@@ -2719,8 +2720,9 @@ public sealed partial class AaruFormat
// Fill FLAC block
if(remaining != 0)
for(var r = 0; r < remaining * 4; r++)
_writingBuffer[_writingBufferPosition + r] = 0;
{
for(var r = 0; r < remaining * 4; r++) _writingBuffer[_writingBufferPosition + r] = 0;
}
compressedLength = FLAC.EncodeBuffer(_writingBuffer,
_compressedBuffer,