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] Convert to switch expressions.

Browse Source
This commit is contained in:
Natalia Portillo
2024-05-01 17:18:37 +01:00
parent 87613c03b7
commit b75fcf0f41
48 changed files with 1321 additions and 2619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Aaru.Images/CDRDAO/Helpers.cs
View File

@@ -39,45 +39,28 @@ public sealed partial class Cdrdao
{
static ushort CdrdaoTrackTypeToCookedBytesPerSector(string trackType)
{
switch(trackType)
{
case CDRDAO_TRACK_TYPE_MODE1:
case CDRDAO_TRACK_TYPE_MODE2_FORM1:
case CDRDAO_TRACK_TYPE_MODE1_RAW:
return 2048;
case CDRDAO_TRACK_TYPE_MODE2_FORM2:
return 2324;
case CDRDAO_TRACK_TYPE_MODE2:
case CDRDAO_TRACK_TYPE_MODE2_MIX:
case CDRDAO_TRACK_TYPE_MODE2_RAW:
return 2336;
case CDRDAO_TRACK_TYPE_AUDIO:
return 2352;
default:
return 0;
}
return trackType switch
{
CDRDAO_TRACK_TYPE_MODE1 or CDRDAO_TRACK_TYPE_MODE2_FORM1 or CDRDAO_TRACK_TYPE_MODE1_RAW => 2048,
CDRDAO_TRACK_TYPE_MODE2_FORM2 => 2324,
CDRDAO_TRACK_TYPE_MODE2 or CDRDAO_TRACK_TYPE_MODE2_MIX or CDRDAO_TRACK_TYPE_MODE2_RAW => 2336,
CDRDAO_TRACK_TYPE_AUDIO => 2352,
_ => 0
};
}
static TrackType CdrdaoTrackTypeToTrackType(string trackType)
{
switch(trackType)
{
case CDRDAO_TRACK_TYPE_MODE1:
case CDRDAO_TRACK_TYPE_MODE1_RAW:
return TrackType.CdMode1;
case CDRDAO_TRACK_TYPE_MODE2_FORM1:
return TrackType.CdMode2Form1;
case CDRDAO_TRACK_TYPE_MODE2_FORM2:
return TrackType.CdMode2Form2;
case CDRDAO_TRACK_TYPE_MODE2:
case CDRDAO_TRACK_TYPE_MODE2_MIX:
case CDRDAO_TRACK_TYPE_MODE2_RAW:
return TrackType.CdMode2Formless;
case CDRDAO_TRACK_TYPE_AUDIO:
return TrackType.Audio;
default:
return TrackType.Data;
}
return trackType switch
{
CDRDAO_TRACK_TYPE_MODE1 or CDRDAO_TRACK_TYPE_MODE1_RAW => TrackType.CdMode1,
CDRDAO_TRACK_TYPE_MODE2_FORM1 => TrackType.CdMode2Form1,
CDRDAO_TRACK_TYPE_MODE2_FORM2 => TrackType.CdMode2Form2,
CDRDAO_TRACK_TYPE_MODE2 or CDRDAO_TRACK_TYPE_MODE2_MIX or CDRDAO_TRACK_TYPE_MODE2_RAW => TrackType
.CdMode2Formless,
CDRDAO_TRACK_TYPE_AUDIO => TrackType.Audio,
_ => TrackType.Data
};
}
static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>

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

@@ -573,25 +573,12 @@ public sealed partial class Cdrdao
_descriptorStream.WriteLine();
_descriptorStream.WriteLine("// Track {0}", track.Sequence);
string subchannelType;
switch(track.SubchannelType)
{
case TrackSubchannelType.Packed:
case TrackSubchannelType.PackedInterleaved:
subchannelType = " RW";
break;
case TrackSubchannelType.Raw:
case TrackSubchannelType.RawInterleaved:
subchannelType = " RW_RAW";
break;
default:
subchannelType = "";
break;
}
string subchannelType = track.SubchannelType switch
{
TrackSubchannelType.Packed or TrackSubchannelType.PackedInterleaved => " RW",
TrackSubchannelType.Raw or TrackSubchannelType.RawInterleaved => " RW_RAW",
_ => ""
};
_descriptorStream.WriteLine("TRACK {0}{1}", GetTrackMode(track), subchannelType);