CardManager: remove redundant calls. (PR #1179)

This commit is contained in:
Andrea 2023-02-05 21:05:57 +00:00 committed by GitHub
parent b2926390c8
commit 5dd14256c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 13 deletions

View File

@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "CardManager.h"
#include "Core.h"
#include "Registry.h"
#include "Disk.h"
@ -251,8 +250,7 @@ void CardManager::Destroy()
}
}
GetCardMgr().GetDisk2CardMgr().Destroy();
GetCardMgr().GetMockingboardCardMgr().Destroy();
GetMockingboardCardMgr().Destroy();
}
void CardManager::Reset(const bool powerCycle)
@ -265,7 +263,7 @@ void CardManager::Reset(const bool powerCycle)
}
}
GetCardMgr().GetMockingboardCardMgr().Reset(powerCycle);
GetMockingboardCardMgr().Reset(powerCycle);
}
void CardManager::Update(const ULONG nExecutedCycles)
@ -278,7 +276,7 @@ void CardManager::Update(const ULONG nExecutedCycles)
}
}
GetCardMgr().GetMockingboardCardMgr().Update(nExecutedCycles);
GetMockingboardCardMgr().Update(nExecutedCycles);
}
void CardManager::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)

View File

@ -106,13 +106,6 @@ void Disk2CardManager::LoadLastDiskImage(void)
}
}
// Called by CardManager::Destroy()
void Disk2CardManager::Destroy(void)
{
// NB. All cards (including any Disk2 cards) have just been destroyed by CardManager
// - so nothing to do
}
bool Disk2CardManager::IsAnyFirmware13Sector(void)
{
for (UINT i = 0; i < NUM_SLOTS; i++)

View File

@ -12,7 +12,6 @@ public:
bool GetEnhanceDisk(void);
void SetEnhanceDisk(bool enhanceDisk);
void LoadLastDiskImage(void);
void Destroy(void);
bool IsAnyFirmware13Sector(void);
void GetFilenameAndPathForSaveState(std::string& filename, std::string& path);
void SetStepperDefer(bool defer);