Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

WIP: support all slots in Prop.SheetHelper

Browse Source
This commit is contained in:
tomcw
2025-11-16 22:06:59 +00:00
parent 590b15d53e
commit 4d52ffb345
3 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Configuration/PageSound.cpp
+28 -14
View File
@@ -103,18 +103,32 @@ INT_PTR CPageSound::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPAR
case WM_COMMAND:
switch (LOWORD(wparam))
{
#if 0
case IDC_SPKR_VOLUME:
break;
case IDC_MB_VOLUME:
break;
#endif
case IDC_SLOT0:
case IDC_SLOT1:
case IDC_SLOT2:
case IDC_SLOT3:
case IDC_SLOT4:
case IDC_SLOT5:
case IDC_SLOT6:
case IDC_SLOT7:
if (HIWORD(wparam) == CBN_SELCHANGE)
{
UINT slot = (LOWORD(wparam) == IDC_SLOT4) ? SLOT4 : SLOT5;
uint32_t newChoiceItem = (uint32_t)SendDlgItemMessage(hWnd, LOWORD(wparam), CB_GETCURSEL, 0, 0);
const UINT slot = (LOWORD(wparam) - IDC_SLOT0) / 2;
const uint32_t newChoiceItem = (uint32_t)SendDlgItemMessage(hWnd, LOWORD(wparam), CB_GETCURSEL, 0, 0);
SS_CARDTYPE newCard = CT_Empty;
if (newChoiceItem < choicesList[slot].size())
newCard = choicesList[slot][newChoiceItem];
else
_ASSERT(0);
#if 0
switch (newChoiceItem)
{
case SC_MOCKINGBOARD: newCard = CT_MockingboardC; break;
@@ -125,6 +139,7 @@ INT_PTR CPageSound::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPAR
case SC_SDMUSIC: newCard = CT_SDMusic; break;
default: _ASSERT(0); break;
}
#endif
m_PropertySheetHelper.GetConfigNew().m_Slot[slot] = newCard;
}
@@ -181,6 +196,7 @@ void CPageSound::DlgOK(HWND hWnd)
m_PropertySheetHelper.PostMsgAfterClose(hWnd, m_Page);
}
#if 0
CPageSound::SOUNDCARDCHOICE CPageSound::CardTypeToComboItem(SS_CARDTYPE card)
{
switch (card)
@@ -194,6 +210,7 @@ CPageSound::SOUNDCARDCHOICE CPageSound::CardTypeToComboItem(SS_CARDTYPE card)
default: _ASSERT(0); return SC_EMPTY;
}
}
#endif
CPageSound::AUXCARDCHOICE CPageSound::AuxCardTypeToComboItem(SS_CARDTYPE card)
{
@@ -219,6 +236,7 @@ int CPageSound::CardTypeToComboItem(UINT slot)
void CPageSound::InitOptions(HWND hWnd)
{
#if 0
const SS_CARDTYPE slot4 = m_PropertySheetHelper.GetConfigNew().m_Slot[SLOT4];
const SS_CARDTYPE slot5 = m_PropertySheetHelper.GetConfigNew().m_Slot[SLOT5];
@@ -244,6 +262,13 @@ void CPageSound::InitOptions(HWND hWnd)
else
m_PropertySheetHelper.FillComboBox(hWnd, IDC_SLOT5, m_soundCardChoice_Unavailable, 0);
bool enableMBVolume = slot4 == CT_MockingboardC || slot5 == CT_MockingboardC
|| slot4 == CT_Phasor || slot5 == CT_Phasor
|| slot4 == CT_MegaAudio || slot5 == CT_MegaAudio
|| slot4 == CT_SDMusic || slot5 == CT_SDMusic;
EnableWindow(GetDlgItem(hWnd, IDC_MB_VOLUME), enableMBVolume ? TRUE : FALSE);
#endif
if (IsApple2PlusOrClone(GetApple2Type()))
{
std::string choices;
@@ -259,13 +284,10 @@ void CPageSound::InitOptions(HWND hWnd)
for (int slot = SLOT1; slot < NUM_SLOTS; slot++)
{
if (slot == 4 || slot == 5)
continue;
std::string choices;
GetCardMgr().GetCardChoicesForSlot(slot, choices, choicesList[slot]);
int currentChoice = CardTypeToComboItem(slot);
m_PropertySheetHelper.FillComboBox(hWnd, IDC_SLOT0+slot*2, choices.c_str(), currentChoice);
m_PropertySheetHelper.FillComboBox(hWnd, IDC_SLOT0 + slot * 2, choices.c_str(), currentChoice);
}
if (IsAppleIIe(GetApple2Type()))
@@ -278,12 +300,4 @@ void CPageSound::InitOptions(HWND hWnd)
EnableWindow(GetDlgItem(hWnd, IDC_SLOTAUX), FALSE);
EnableWindow(GetDlgItem(hWnd, IDC_SLOTAUX_OPTION), FALSE);
}
#if 0
bool enableMBVolume = slot4 == CT_MockingboardC || slot5 == CT_MockingboardC
|| slot4 == CT_Phasor || slot5 == CT_Phasor
|| slot4 == CT_MegaAudio || slot5 == CT_MegaAudio
|| slot4 == CT_SDMusic || slot5 == CT_SDMusic;
EnableWindow(GetDlgItem(hWnd, IDC_MB_VOLUME), enableMBVolume ? TRUE : FALSE);
#endif
}
source/Configuration/PageSound.h
+2 -2
View File
@@ -28,11 +28,11 @@ protected:
virtual void DlgCANCEL(HWND hWnd){}
private:
enum SOUNDCARDCHOICE { SC_MOCKINGBOARD = 0, SC_PHASOR, SC_SAM, SC_EMPTY, SC_MEGAAUDIO, SC_SDMUSIC };
// enum SOUNDCARDCHOICE { SC_MOCKINGBOARD = 0, SC_PHASOR, SC_SAM, SC_EMPTY, SC_MEGAAUDIO, SC_SDMUSIC };
enum AUXCARDCHOICE { SC_80COL = 0, SC_EXT80COL, SC_RAMWORKS, SC_AUX_EMPTY };
void InitOptions(HWND hWnd);
SOUNDCARDCHOICE CardTypeToComboItem(SS_CARDTYPE card);
// SOUNDCARDCHOICE CardTypeToComboItem(SS_CARDTYPE card);
AUXCARDCHOICE AuxCardTypeToComboItem(SS_CARDTYPE card);
int CardTypeToComboItem(UINT slot);
source/Configuration/PropertySheetHelper.cpp
+23 -30
View File
@@ -333,25 +333,19 @@ void CPropertySheetHelper::ApplyNewConfig(const CConfigNeedingRestart& ConfigNew
SaveCpuType(ConfigNew.m_CpuType);
}
UINT slot = SLOT3;
if (CONFIG_CHANGED_LOCAL(m_Slot[slot]))
SetSlot(slot, ConfigNew.m_Slot[slot]);
for (UINT slot = SLOT0; slot < NUM_SLOTS; slot++)
{
if (CONFIG_CHANGED_LOCAL(m_Slot[slot]))
SetSlot(slot, ConfigNew.m_Slot[slot]);
}
// unconditionally save it, as the previous SetSlot might have removed the setting
PCapBackend::SetRegistryInterface(slot, ConfigNew.m_tfeInterface);
Uthernet2::SetRegistryVirtualDNS(slot, ConfigNew.m_tfeVirtualDNS);
slot = SLOT4;
if (CONFIG_CHANGED_LOCAL(m_Slot[slot]))
SetSlot(slot, ConfigNew.m_Slot[slot]);
slot = SLOT5;
if (CONFIG_CHANGED_LOCAL(m_Slot[slot]))
SetSlot(slot, ConfigNew.m_Slot[slot]);
slot = SLOT7;
if (CONFIG_CHANGED_LOCAL(m_Slot[slot]))
SetSlot(slot, ConfigNew.m_Slot[slot]);
#if 0
// unconditionally save it, as the previous SetSlot(SLOT3,...) might have removed the setting
// TC: Why? if UthernetI/II has been removed from SLOT3, then it no longer matters for the new card in SLOT3
// . or perhaps make these global Configuration settings, not slot-specific?
PCapBackend::SetRegistryInterface(SLOT3, ConfigNew.m_tfeInterface);
Uthernet2::SetRegistryVirtualDNS(SLOT3, ConfigNew.m_tfeVirtualDNS);
#endif
if (CONFIG_CHANGED_LOCAL(m_bEnableTheFreezesF8Rom))
{
@@ -394,10 +388,10 @@ void CPropertySheetHelper::RestoreCurrentConfig(void)
// NB. clone-type is encoded in g_Apple2Type
SetApple2Type(m_ConfigOld.m_Apple2Type);
SetMainCpu(m_ConfigOld.m_CpuType);
SetSlot(SLOT3, m_ConfigOld.m_Slot[SLOT3]);
SetSlot(SLOT4, m_ConfigOld.m_Slot[SLOT4]);
SetSlot(SLOT5, m_ConfigOld.m_Slot[SLOT5]);
SetSlot(SLOT7, m_ConfigOld.m_Slot[SLOT7]);
for (UINT slot = SLOT0; slot < NUM_SLOTS; slot++)
{
SetSlot(slot, m_ConfigOld.m_Slot[slot]);
}
GetPropertySheet().SetTheFreezesF8Rom(m_ConfigOld.m_bEnableTheFreezesF8Rom);
}
@@ -452,23 +446,22 @@ bool CPropertySheetHelper::HardwareConfigChanged(HWND hWnd)
if (CONFIG_CHANGED(m_videoRefreshRate))
strMsgMain += ". Video refresh rate has changed\n";
if (CONFIG_CHANGED(m_Slot[SLOT3]))
strMsgMain += GetSlot(SLOT3);
for (UINT slot = SLOT0; slot < NUM_SLOTS; slot++)
{
if (CONFIG_CHANGED(m_Slot[slot]))
strMsgMain += GetSlot(slot);
}
#if 0
if (CONFIG_CHANGED(m_tfeInterface))
strMsgMain += ". Uthernet interface has changed\n";
if (CONFIG_CHANGED(m_tfeVirtualDNS))
strMsgMain += ". Uthernet Virtual DNS has changed\n";
if (CONFIG_CHANGED(m_Slot[SLOT4]))
strMsgMain += GetSlot(SLOT4);
if (CONFIG_CHANGED(m_Slot[SLOT5]))
strMsgMain += GetSlot(SLOT5);
if (CONFIG_CHANGED(m_Slot[SLOT7]))
strMsgMain += ". Harddisk(s) have been plugged/unplugged\n";
#endif
if (CONFIG_CHANGED(m_bEnableTheFreezesF8Rom))
strMsgMain += ". F8 ROM changed (The Freeze's F8 Rom)\n";