From 367b956df8cc59fe538e0edcd5655a54a056395b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 9 Sep 2018 17:54:17 +0100 Subject: [PATCH] Added CDTV, CD32, Nuon, Playdia and Pippin media types. --- .../Metadata/MediaType.cs | 24 +++++++++++++++++++ .../Alcohol120/Properties.cs | 3 ++- DiscImageChef.DiscImages/CDRDAO/Properties.cs | 3 ++- DiscImageChef.DiscImages/CDRWin/Properties.cs | 3 ++- .../CloneCD/Properties.cs | 3 ++- .../DiscImageChef/Helpers.cs | 7 +++++- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/DiscImageChef.CommonTypes/Metadata/MediaType.cs b/DiscImageChef.CommonTypes/Metadata/MediaType.cs index a042b7990..247e0e144 100644 --- a/DiscImageChef.CommonTypes/Metadata/MediaType.cs +++ b/DiscImageChef.CommonTypes/Metadata/MediaType.cs @@ -348,6 +348,10 @@ namespace DiscImageChef.CommonTypes.Metadata discType = "Compact Disc"; discSubType = "Video CD"; break; + case CommonTypes.MediaType.Nuon: + discType = "DVD"; + discSubType = "Nuon"; + break; case CommonTypes.MediaType.XGD: discType = "DVD"; discSubType = "Xbox Game Disc (XGD)"; @@ -722,6 +726,22 @@ namespace DiscImageChef.CommonTypes.Metadata discType = "Compact Disc"; discSubType = "NEO-GEO CD"; break; + case CommonTypes.MediaType.CDTV: + discType = "Compact Disc"; + discSubType = "Commodore CDTV"; + break; + case CommonTypes.MediaType.CD32: + discType = "Compact Disc"; + discSubType = "Amiga CD32"; + break; + case CommonTypes.MediaType.Playdia: + discType = "Compact Disc"; + discSubType = "Bandai Playdia"; + break; + case CommonTypes.MediaType.Pippin: + discType = "Compact Disc"; + discSubType = "Apple Pippin"; + break; case CommonTypes.MediaType.ZIP100: discType = "Iomega ZIP"; discSubType = "Iomega ZIP100"; @@ -1550,6 +1570,10 @@ namespace DiscImageChef.CommonTypes.Metadata discType = "Super Nintendo Game Pak (US)"; discSubType = "Super Nintendo Game Pak (US)"; break; + case CommonTypes.MediaType.SwitchGameCard: + discType = "Nintendo Switch Game Card"; + discSubType = "Nintendo Switch Game Card"; + break; case CommonTypes.MediaType.IBM3470: discType = "IBM 3470"; discSubType = "IBM 3470"; diff --git a/DiscImageChef.DiscImages/Alcohol120/Properties.cs b/DiscImageChef.DiscImages/Alcohol120/Properties.cs index eeab6ae91..2d428d228 100644 --- a/DiscImageChef.DiscImages/Alcohol120/Properties.cs +++ b/DiscImageChef.DiscImages/Alcohol120/Properties.cs @@ -132,7 +132,8 @@ namespace DiscImageChef.DiscImages MediaType.PS2CD, MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, - MediaType.NeoGeoCD, MediaType.PCFX + MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, + MediaType.Playdia, MediaType.Pippin }; public IEnumerable<(string name, Type type, string description)> SupportedOptions => new (string name, Type type, string description)[] { }; diff --git a/DiscImageChef.DiscImages/CDRDAO/Properties.cs b/DiscImageChef.DiscImages/CDRDAO/Properties.cs index 6a9819d27..ef0857280 100644 --- a/DiscImageChef.DiscImages/CDRDAO/Properties.cs +++ b/DiscImageChef.DiscImages/CDRDAO/Properties.cs @@ -114,7 +114,8 @@ namespace DiscImageChef.DiscImages MediaType.CDRW, MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PD650, MediaType.PD650_WORM, MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, - MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX + MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, + MediaType.Nuon, MediaType.Playdia, MediaType.Pippin }; public IEnumerable<(string name, Type type, string description)> SupportedOptions => new[] {("separate", typeof(bool), "Write each track to a separate file.")}; diff --git a/DiscImageChef.DiscImages/CDRWin/Properties.cs b/DiscImageChef.DiscImages/CDRWin/Properties.cs index aa5121412..8e910659e 100644 --- a/DiscImageChef.DiscImages/CDRWin/Properties.cs +++ b/DiscImageChef.DiscImages/CDRWin/Properties.cs @@ -119,7 +119,8 @@ namespace DiscImageChef.DiscImages MediaType.PD650_WORM, MediaType.PS1CD, MediaType.PS2CD, MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, - MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX + MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, + MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin }; public IEnumerable<(string name, Type type, string description)> SupportedOptions => new[] {("separate", typeof(bool), "Write each track to a separate file.")}; diff --git a/DiscImageChef.DiscImages/CloneCD/Properties.cs b/DiscImageChef.DiscImages/CloneCD/Properties.cs index 70fb7107d..19967f735 100644 --- a/DiscImageChef.DiscImages/CloneCD/Properties.cs +++ b/DiscImageChef.DiscImages/CloneCD/Properties.cs @@ -66,7 +66,8 @@ namespace DiscImageChef.DiscImages MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW, MediaType.CDV, MediaType.DTSCD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, - MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX + MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, + MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin }; public IEnumerable<(string name, Type type, string description)> SupportedOptions => new (string name, Type type, string description)[] { }; diff --git a/DiscImageChef.DiscImages/DiscImageChef/Helpers.cs b/DiscImageChef.DiscImages/DiscImageChef/Helpers.cs index d99a37cad..d4f620ffc 100644 --- a/DiscImageChef.DiscImages/DiscImageChef/Helpers.cs +++ b/DiscImageChef.DiscImages/DiscImageChef/Helpers.cs @@ -208,7 +208,12 @@ namespace DiscImageChef.DiscImages case MediaType.NeoGeoCD: case MediaType.GOD: case MediaType.WOD: - case MediaType.WUOD: return XmlMediaType.OpticalDisc; + case MediaType.WUOD: + case MediaType.CDTV: + case MediaType.CD32: + case MediaType.Nuon: + case MediaType.Playdia: + case MediaType.Pippin: return XmlMediaType.OpticalDisc; default: return XmlMediaType.BlockMedia; } }