Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-05-28 17:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Don't construct MB_SUBUNIT twice

Browse Source
This commit is contained in:
tomcw 2023-01-25 21:28:06 +00:00
parent b58895b8cb
commit c6059dadc1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Mockingboard.cpp
View File

@ -69,11 +69,6 @@ MockingboardCard::MockingboardCard(UINT slot, SS_CARDTYPE type) : Card(type, slo
for (UINT i = 0; i < NUM_VOICES; i++)
m_ppAYVoiceBuffer[NUM_VOICES] = NULL;
// Construct via placement new, so that it is an array of 'MB_SUBUNIT' objects
m_MBSubUnit = (MB_SUBUNIT*) new BYTE[sizeof(MB_SUBUNIT) * NUM_SUBUNITS_PER_MB];
for (UINT i = 0; i < NUM_SUBUNITS_PER_MB; i++)
new (&m_MBSubUnit[i]) MB_SUBUNIT(m_slot);
m_inActiveCycleCount = 0;
m_regAccessedFlag = false;
m_isActive = false;
@ -96,9 +91,13 @@ MockingboardCard::MockingboardCard(UINT slot, SS_CARDTYPE type) : Card(type, slo
for (UINT i = 0; i < NUM_VOICES; i++)
m_ppAYVoiceBuffer[i] = new short[MAX_SAMPLES]; // Buffer can hold a max of 0.37 seconds worth of samples (16384/44100)
// Construct via placement new, so that it is an array of 'MB_SUBUNIT' objects
m_MBSubUnit = (MB_SUBUNIT*) new BYTE[sizeof(MB_SUBUNIT) * NUM_SUBUNITS_PER_MB];
memset(m_MBSubUnit, sizeof(MB_SUBUNIT) * NUM_SUBUNITS_PER_MB, 0);
for (UINT i = 0; i < NUM_SUBUNITS_PER_MB; i++)
{
m_MBSubUnit[i] = MB_SUBUNIT(m_slot);
new (&m_MBSubUnit[i]) MB_SUBUNIT(m_slot);
m_MBSubUnit[i].nAY8910Number = i;
const UINT id0 = i * SY6522::kNumTimersPer6522 + 0; // TIMER1
const UINT id1 = i * SY6522::kNumTimersPer6522 + 1; // TIMER2

2
source/SoundCore.cpp
View File

@ -48,7 +48,7 @@ static LPDIRECTSOUND g_lpDS = NULL;
// Used for muting & fading:
static const UINT uMAX_VOICES = 6; // 4x SSI263 + spkr + MockingboardCardManager
static const UINT uMAX_VOICES = NUM_SLOTS * 2 + 1 + 1; // 8x (2x SSI263) + spkr + MockingboardCardManager
static UINT g_uNumVoices = 0;
static VOICE* g_pVoices[uMAX_VOICES] = {NULL};