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 merge pattern.

Browse Source
This commit is contained in:
Natalia Portillo
2022-03-16 11:47:00 +00:00
parent 5f14f0e79c
commit ff65da6c48
115 changed files with 4810 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aaru.Images/CDRDAO/Read.cs
View File

@@ -1097,8 +1097,7 @@ public sealed partial class Cdrdao
{
buffer = null;
if(tag == SectorTagType.CdTrackFlags ||
tag == SectorTagType.CdTrackIsrc)
if(tag is SectorTagType.CdTrackFlags or SectorTagType.CdTrackIsrc)
track = (uint)sectorAddress;
var aaruTrack = new CdrdaoTrack

8
Aaru.Images/CDRDAO/Write.cs
View File

@@ -461,8 +461,7 @@ public sealed partial class Cdrdao
foreach(Track track in tracks.OrderBy(t => t.Sequence))
{
if(track.SubchannelType == TrackSubchannelType.Q16 ||
track.SubchannelType == TrackSubchannelType.Q16Interleaved)
if(track.SubchannelType is TrackSubchannelType.Q16 or TrackSubchannelType.Q16Interleaved)
{
ErrorMessage = $"Unsupported subchannel type {track.SubchannelType} for track {track.Sequence}";
@@ -526,8 +525,9 @@ public sealed partial class Cdrdao
bool data = _writingTracks.Count(t => t.Type != TrackType.Audio) > 0;
bool mode2 = _writingTracks.Count(t => t.Type == TrackType.CdMode2Form1 || t.Type == TrackType.CdMode2Form2 ||
t.Type == TrackType.CdMode2Formless) > 0;
bool mode2 =
_writingTracks.Count(t => t.Type is TrackType.CdMode2Form1 or TrackType.CdMode2Form2
or TrackType.CdMode2Formless) > 0;
if(mode2)
_descriptorStream.WriteLine("CD_ROM_XA");