From 568197f9a635b406cbf9954ff33599098f85d4df Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 21 Nov 2020 16:21:28 +0000 Subject: [PATCH] Support PhotoCD in CD supporting writable images. Fixes #435 --- Aaru.Images/Alcohol120/Properties.cs | 4 ++-- Aaru.Images/CDRDAO/Properties.cs | 4 ++-- Aaru.Images/CDRWin/Properties.cs | 4 ++-- Aaru.Images/CloneCD/Properties.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs index 8e75a728d..a7c8aeb99 100644 --- a/Aaru.Images/Alcohol120/Properties.cs +++ b/Aaru.Images/Alcohol120/Properties.cs @@ -80,7 +80,7 @@ namespace Aaru.DiscImages var aaruTrack = new CommonTypes.Structs.Track { TrackStartSector = alcTrack.startLba, - TrackEndSector = (alcTrack.startLba + alcExtra.sectors) - 1, + TrackEndSector = alcTrack.startLba + alcExtra.sectors - 1, TrackPregap = alcExtra.pregap, TrackSession = sessionNo, TrackSequence = alcTrack.point, @@ -157,7 +157,7 @@ namespace Aaru.DiscImages MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, - MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD + MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD }; public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new (string name, Type type, string description, object @default)[] diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs index 4154709e8..5da70d17b 100644 --- a/Aaru.Images/CDRDAO/Properties.cs +++ b/Aaru.Images/CDRDAO/Properties.cs @@ -84,7 +84,7 @@ namespace Aaru.DiscImages TrackBytesPerSector = CdrdaoTrackTypeToCookedBytesPerSector(cdrTrack.Tracktype) }; - aaruTrack.TrackEndSector = (aaruTrack.TrackStartSector + cdrTrack.Sectors) - 1; + aaruTrack.TrackEndSector = aaruTrack.TrackStartSector + cdrTrack.Sectors - 1; if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector)) cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector); @@ -132,7 +132,7 @@ namespace Aaru.DiscImages MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, - MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD + MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD }; public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[] { diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs index 2a32d5f7f..60d06b828 100644 --- a/Aaru.Images/CDRWin/Properties.cs +++ b/Aaru.Images/CDRWin/Properties.cs @@ -118,7 +118,7 @@ namespace Aaru.DiscImages previousTrackFile = cdrTrack.TrackFile.DataFilter.GetFilename(); - aaruTrack.TrackEndSector = (aaruTrack.TrackStartSector + cdrTrack.Sectors) - 1; + aaruTrack.TrackEndSector = aaruTrack.TrackStartSector + cdrTrack.Sectors - 1; if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG) { @@ -211,7 +211,7 @@ namespace Aaru.DiscImages MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, - MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD + MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD }; public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[] { diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs index 69b3b7567..3246aa379 100644 --- a/Aaru.Images/CloneCD/Properties.cs +++ b/Aaru.Images/CloneCD/Properties.cs @@ -80,7 +80,7 @@ namespace Aaru.DiscImages MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, - MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD + MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD }; public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new (string name, Type type, string description, object @default)[]