From 1e703286f04b2ea32f1528abe817ae50b94fee5e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 2 Oct 2021 19:47:10 +1000 Subject: [PATCH] Config: Convert MemoryCardType to an enum class --- pcsx2/Config.h | 10 ++--- pcsx2/MemoryCardFile.cpp | 42 +++++++++---------- pcsx2/MemoryCardFolder.cpp | 2 +- pcsx2/Pcsx2Config.cpp | 2 +- pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp | 10 ++--- pcsx2/gui/Panels/MemoryCardListPanel.cpp | 6 +-- pcsx2/gui/Panels/MemoryCardPanels.h | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pcsx2/Config.h b/pcsx2/Config.h index 1ed0771b46..31c40f3642 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -84,12 +84,12 @@ enum class FMVAspectRatioSwitchType : u8 MaxCount }; -enum MemoryCardType +enum class MemoryCardType { - MemoryCard_None, - MemoryCard_File, - MemoryCard_Folder, - MemoryCard_MaxCount + Empty, + File, + Folder, + MaxCount }; enum class LimiterModeType : u8 diff --git a/pcsx2/MemoryCardFile.cpp b/pcsx2/MemoryCardFile.cpp index f715e5dde8..dbc14c59d0 100644 --- a/pcsx2/MemoryCardFile.cpp +++ b/pcsx2/MemoryCardFile.cpp @@ -297,7 +297,7 @@ void FileMemoryCard::Open() cont = true; } - if (EmuConfig.Mcd[slot].Type != MemoryCardType::MemoryCard_File) + if (EmuConfig.Mcd[slot].Type != MemoryCardType::File) { str = L"[is not memcard file]"; cont = true; @@ -607,16 +607,16 @@ void FileMcd_EmuOpen() { if (EmuConfig.Mcd[slot].Enabled) { - MemoryCardType type = MemoryCardType::MemoryCard_File; // default to file if we can't find anything at the path so it gets auto-generated + MemoryCardType type = MemoryCardType::File; // default to file if we can't find anything at the path so it gets auto-generated const wxString path = EmuConfig.FullpathToMcd(slot); if (wxFileExists(path)) { - type = MemoryCardType::MemoryCard_File; + type = MemoryCardType::File; } else if (wxDirExists(path)) { - type = MemoryCardType::MemoryCard_Folder; + type = MemoryCardType::Folder; } EmuConfig.Mcd[slot].Type = type; @@ -642,9 +642,9 @@ s32 FileMcd_IsPresent(uint port, uint slot) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.IsPresent(combinedSlot); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.IsPresent(combinedSlot); default: return false; @@ -656,10 +656,10 @@ void FileMcd_GetSizeInfo(uint port, uint slot, McdSizeInfo* outways) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: Mcd::impl.GetSizeInfo(combinedSlot, *outways); break; - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: Mcd::implFolder.GetSizeInfo(combinedSlot, *outways); break; default: @@ -672,9 +672,9 @@ bool FileMcd_IsPSX(uint port, uint slot) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.IsPSX(combinedSlot); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.IsPSX(combinedSlot); default: return false; @@ -686,9 +686,9 @@ s32 FileMcd_Read(uint port, uint slot, u8* dest, u32 adr, int size) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.Read(combinedSlot, dest, adr, size); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.Read(combinedSlot, dest, adr, size); default: return 0; @@ -700,9 +700,9 @@ s32 FileMcd_Save(uint port, uint slot, const u8* src, u32 adr, int size) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.Save(combinedSlot, src, adr, size); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.Save(combinedSlot, src, adr, size); default: return 0; @@ -714,9 +714,9 @@ s32 FileMcd_EraseBlock(uint port, uint slot, u32 adr) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.EraseBlock(combinedSlot, adr); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.EraseBlock(combinedSlot, adr); default: return 0; @@ -728,9 +728,9 @@ u64 FileMcd_GetCRC(uint port, uint slot) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: return Mcd::impl.GetCRC(combinedSlot); - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.GetCRC(combinedSlot); default: return 0; @@ -745,7 +745,7 @@ void FileMcd_NextFrame(uint port, uint slot) //case MemoryCardType::MemoryCard_File: // Mcd::impl.NextFrame( combinedSlot ); // break; - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: Mcd::implFolder.NextFrame(combinedSlot); break; default: @@ -758,10 +758,10 @@ bool FileMcd_ReIndex(uint port, uint slot, const wxString& filter) const uint combinedSlot = FileMcd_ConvertToSlot(port, slot); switch (EmuConfig.Mcd[combinedSlot].Type) { - //case MemoryCardType::MemoryCard_File: + //case MemoryCardType::File: // return Mcd::impl.ReIndex( combinedSlot, filter ); // break; - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: return Mcd::implFolder.ReIndex(combinedSlot, EmuConfig.McdFolderAutoManage, filter); break; default: diff --git a/pcsx2/MemoryCardFolder.cpp b/pcsx2/MemoryCardFolder.cpp index e6f7369635..35a525870a 100644 --- a/pcsx2/MemoryCardFolder.cpp +++ b/pcsx2/MemoryCardFolder.cpp @@ -104,7 +104,7 @@ void FolderMemoryCard::Open(const wxString& fullPath, const Pcsx2Config::McdOpti wxString str(configuredFileName.GetFullPath()); bool disabled = false; - if (mcdOptions.Enabled && mcdOptions.Type == MemoryCardType::MemoryCard_Folder) + if (mcdOptions.Enabled && mcdOptions.Type == MemoryCardType::Folder) { if (configuredFileName.GetFullName().IsEmpty()) { diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index 298a67e0e6..7bd305245d 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -511,7 +511,7 @@ Pcsx2Config::Pcsx2Config() Mcd[slot].Filename = FileMcd_GetDefaultName(slot); // Folder memory card is autodetected later. - Mcd[slot].Type = MemoryCardType::MemoryCard_File; + Mcd[slot].Type = MemoryCardType::File; } GzipIsoIndexTemplate = "$(f).pindex.tmp"; diff --git a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp index 5635a1ead4..4453ae6ec5 100644 --- a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp +++ b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp @@ -62,7 +62,7 @@ Dialogs::ConvertMemoryCardDialog::ConvertMemoryCardDialog( wxWindow* parent, con s_padding += m_radio_CardType | pxSizerFlags::StdExpand(); - if ( type != MemoryCardType::MemoryCard_File ) { + if ( type != MemoryCardType::File ) { s_padding += Heading( pxE( L"Please note that the resulting file may not actually contain all saves, depending on how many are in the source memory card." ) ); } s_padding += Heading( pxE( L"WARNING: Converting a memory card may take a while! Please do not close the emulator during the conversion process, even if the emulator is no longer responding to input." ) ); @@ -102,10 +102,10 @@ void Dialogs::ConvertMemoryCardDialog::CreateControls( const MemoryCardType sour const RadioPanelItem tblForFolder[] = { toFile8MB, toFile16MB, toFile32MB, toFile64MB }; switch ( sourceType ) { - case MemoryCardType::MemoryCard_File: + case MemoryCardType::File: m_radio_CardType = new pxRadioPanel( this, tblForFile ); break; - case MemoryCardType::MemoryCard_Folder: + case MemoryCardType::Folder: m_radio_CardType = new pxRadioPanel( this, tblForFolder ); break; default: @@ -177,7 +177,7 @@ bool Dialogs::ConvertMemoryCardDialog::ConvertToFile( const wxFileName& sourcePa FolderMemoryCard sourceFolderMemoryCard; Pcsx2Config::McdOptions config; config.Enabled = true; - config.Type = MemoryCardType::MemoryCard_Folder; + config.Type = MemoryCardType::Folder; sourceFolderMemoryCard.Open( sourcePath.GetFullPath(), config, ( sizeInMB * 1024 * 1024 ) / FolderMemoryCard::ClusterSize, false, L"" ); u8 buffer[FolderMemoryCard::PageSizeRaw]; @@ -206,7 +206,7 @@ bool Dialogs::ConvertMemoryCardDialog::ConvertToFolder( const wxFileName& source FolderMemoryCard targetFolderMemoryCard; Pcsx2Config::McdOptions config; config.Enabled = true; - config.Type = MemoryCardType::MemoryCard_Folder; + config.Type = MemoryCardType::Folder; u32 adr = 0; for ( int i = 0; i < 2; ++i ) { diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 05c301e3dc..2f4d81ecb2 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -62,7 +62,7 @@ bool EnumerateMemoryCard(McdSlotItem& dest, const wxFileName& filename, const wx dest.IsFormatted = false; dest.IsPresent = false; dest.IsPSX = false; - dest.Type = MemoryCardType::MemoryCard_None; + dest.Type = MemoryCardType::Empty; const wxString fullpath(filename.GetFullPath()); //DevCon.WriteLn( fullpath ); @@ -93,7 +93,7 @@ bool EnumerateMemoryCard(McdSlotItem& dest, const wxFileName& filename, const wx dest.SizeInMB = 1; // MegaBIT } - dest.Type = MemoryCardType::MemoryCard_File; + dest.Type = MemoryCardType::File; dest.IsFormatted = IsMcdFormatted(mcdFile); filename.GetTimes(NULL, &dest.DateModified, &dest.DateCreated); } @@ -113,7 +113,7 @@ bool EnumerateMemoryCard(McdSlotItem& dest, const wxFileName& filename, const wx dest.SizeInMB = 0; - dest.Type = MemoryCardType::MemoryCard_Folder; + dest.Type = MemoryCardType::Folder; dest.IsFormatted = IsMcdFormatted(mcdFile); superBlockFileName.GetTimes(NULL, &dest.DateModified, &dest.DateCreated); } diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h index 3262e676ea..4fe2548816 100644 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ b/pcsx2/gui/Panels/MemoryCardPanels.h @@ -64,7 +64,7 @@ struct McdSlotItem { Slot = -1; SizeInMB = 0; - Type = MemoryCard_None; + Type = MemoryCardType::Empty; IsPSX = false; IsPresent = false;