From 60d5a117b500b70237b021ac1246c4ea282d8ee2 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 30 Aug 2022 10:42:04 -0700 Subject: [PATCH] Electronic not Electric (fixes #402) --- CHANGELIST.md | 1 + MPF.Library/InfoTool.cs | 2 +- MPF.Modules/DiscImageCreator/Parameters.cs | 2 +- RedumpLib/Data/Enumerations.cs | 4 ++-- RedumpLib/Data/Extensions.cs | 10 +++++----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index c95c42ce..c7f18d63 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -113,6 +113,7 @@ - Update Aaru submodule to latest devel - Add Sony Electronic Book system - Verify GD-ROM outputs, finally +- Electronic not Electric ### 2.3 (2022-02-05) - Start overhauling Redump information pulling, again diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 1cd50576..7aed69d8 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -237,7 +237,7 @@ namespace MPF.Library case RedumpSystem.PalmOS: case RedumpSystem.PocketPC: case RedumpSystem.RainbowDisc: - case RedumpSystem.SonyElectricBook: + case RedumpSystem.SonyElectronicBook: resultProgress?.Report(Result.Success("Running copy protection scan... this might take a while!")); (string protectionString, Dictionary> fullProtections) = await GetCopyProtection(drive, options, protectionProgress); info.CopyProtection.Protection = protectionString; diff --git a/MPF.Modules/DiscImageCreator/Parameters.cs b/MPF.Modules/DiscImageCreator/Parameters.cs index d0bfcb24..bb7c46cf 100644 --- a/MPF.Modules/DiscImageCreator/Parameters.cs +++ b/MPF.Modules/DiscImageCreator/Parameters.cs @@ -468,7 +468,7 @@ namespace MPF.Modules.DiscImageCreator case RedumpSystem.EnhancedCD: case RedumpSystem.IBMPCcompatible: case RedumpSystem.RainbowDisc: - case RedumpSystem.SonyElectricBook: + case RedumpSystem.SonyElectronicBook: if (File.Exists($"{basePath}_subIntention.txt")) { FileInfo fi = new FileInfo($"{basePath}_subIntention.txt"); diff --git a/RedumpLib/Data/Enumerations.cs b/RedumpLib/Data/Enumerations.cs index c0a0dd84..6a0f10b2 100644 --- a/RedumpLib/Data/Enumerations.cs +++ b/RedumpLib/Data/Enumerations.cs @@ -2446,8 +2446,8 @@ namespace RedumpLib.Data [System(Category = SystemCategory.Other, LongName = "Sega Prologue 21 Multimedia Karaoke System", ShortName = "sp21", HasCues = true, HasDat = true)] SegaPrologue21MultimediaKaraokeSystem, - [System(Category = SystemCategory.Other, Available = false, LongName = "Sony Electric Book")] - SonyElectricBook, + [System(Category = SystemCategory.Other, Available = false, LongName = "Sony Electronic Book")] + SonyElectronicBook, [System(Category = SystemCategory.Other, Available = false, LongName = "Super Audio CD")] SuperAudioCD, diff --git a/RedumpLib/Data/Extensions.cs b/RedumpLib/Data/Extensions.cs index e8560455..cb8385a8 100644 --- a/RedumpLib/Data/Extensions.cs +++ b/RedumpLib/Data/Extensions.cs @@ -674,7 +674,7 @@ namespace RedumpLib.Data break; // UNKNOWN - case RedumpSystem.SonyElectricBook: + case RedumpSystem.SonyElectronicBook: types.Add(MediaType.CDROM); break; @@ -2049,10 +2049,10 @@ namespace RedumpLib.Data case "sega prologue21": case "sega prologue 21": return RedumpSystem.SegaPrologue21MultimediaKaraokeSystem; - case "electricbook": - case "sonyelectricbook": - case "sony electric book": - return RedumpSystem.SonyElectricBook; + case "electronicbook": + case "sonyelectronicbook": + case "sony electronic book": + return RedumpSystem.SonyElectronicBook; case "sacd": case "superaudiocd": case "super audio cd":