ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building on Windows. (Regression from commit 03cca3a.)

This commit is contained in:
rogerman 2025-06-24 02:29:22 -07:00
parent 03cca3a800
commit fe84b11d51
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
desmume/src/frontend/windows/main.cpp
View File

@ -1864,7 +1864,7 @@ class WinDriver : public BaseDriver
static void RefreshMicSettings() static void RefreshMicSettings()
{ {
Mic_DeInit_Physical(); Mic_DeInit_Physical();
if(CommonSettings.micMode == TCommonSettings::Sample) if(CommonSettings.micMode == MicMode_Sample)
{ {
if(!LoadSamples(MicSampleName)) if(!LoadSamples(MicSampleName))
{ {
@ -1878,7 +1878,7 @@ static void RefreshMicSettings()
else else
{ {
LoadSamples(nullptr); LoadSamples(nullptr);
if(CommonSettings.micMode == TCommonSettings::Physical) if(CommonSettings.micMode == MicMode_Physical)
{ {
Mic_Init_Physical(); Mic_Init_Physical();
} }
@ -2024,7 +2024,7 @@ int _main()
CommonSettings.hud.ShowMicrophone = GetPrivateProfileBool("Display","Display Microphone", false, IniName); CommonSettings.hud.ShowMicrophone = GetPrivateProfileBool("Display","Display Microphone", false, IniName);
CommonSettings.hud.ShowRTC = GetPrivateProfileBool("Display","Display RTC", false, IniName); CommonSettings.hud.ShowRTC = GetPrivateProfileBool("Display","Display RTC", false, IniName);
CommonSettings.micMode = (TCommonSettings::MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)TCommonSettings::InternalNoise, IniName); CommonSettings.micMode = (MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)MicMode_InternalNoise, IniName);
GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName); GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName);
RefreshMicSettings(); RefreshMicSettings();
@ -6216,15 +6216,15 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
{ {
HWND cur; HWND cur;
CommonSettings.micMode = (TCommonSettings::MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)TCommonSettings::InternalNoise, IniName); CommonSettings.micMode = (MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)MicMode_InternalNoise, IniName);
CheckDlgButton(hDlg, IDC_USEMICSAMPLE, ((CommonSettings.micMode == TCommonSettings::Sample) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hDlg, IDC_USEMICSAMPLE, ((CommonSettings.micMode == MicMode_Sample) ? BST_CHECKED : BST_UNCHECKED));
CheckDlgButton(hDlg, IDC_USEMICRAND, ((CommonSettings.micMode == TCommonSettings::Random) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hDlg, IDC_USEMICRAND, ((CommonSettings.micMode == MicMode_Random) ? BST_CHECKED : BST_UNCHECKED));
CheckDlgButton(hDlg, IDC_USENOISE, ((CommonSettings.micMode == TCommonSettings::InternalNoise) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hDlg, IDC_USENOISE, ((CommonSettings.micMode == MicMode_InternalNoise) ? BST_CHECKED : BST_UNCHECKED));
CheckDlgButton(hDlg, IDC_USEPHYSICAL, ((CommonSettings.micMode == TCommonSettings::Physical) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hDlg, IDC_USEPHYSICAL, ((CommonSettings.micMode == MicMode_Physical) ? BST_CHECKED : BST_UNCHECKED));
GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName); GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName);
SetDlgItemText(hDlg, IDC_MICSAMPLE, MicSampleName); SetDlgItemText(hDlg, IDC_MICSAMPLE, MicSampleName);
if(CommonSettings.micMode != TCommonSettings::Sample) if(CommonSettings.micMode != MicMode_Sample)
{ {
cur = GetDlgItem(hDlg, IDC_MICSAMPLE); cur = GetDlgItem(hDlg, IDC_MICSAMPLE);
EnableWindow(cur, FALSE); EnableWindow(cur, FALSE);
@ -6245,13 +6245,13 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
HWND cur; HWND cur;
if(IsDlgCheckboxChecked(hDlg, IDC_USEMICSAMPLE)) if(IsDlgCheckboxChecked(hDlg, IDC_USEMICSAMPLE))
CommonSettings.micMode = TCommonSettings::Sample; CommonSettings.micMode = MicMode_Sample;
else if(IsDlgCheckboxChecked(hDlg, IDC_USEMICRAND)) else if(IsDlgCheckboxChecked(hDlg, IDC_USEMICRAND))
CommonSettings.micMode = TCommonSettings::Random; CommonSettings.micMode = MicMode_Random;
else if(IsDlgCheckboxChecked(hDlg, IDC_USENOISE)) else if(IsDlgCheckboxChecked(hDlg, IDC_USENOISE))
CommonSettings.micMode = TCommonSettings::InternalNoise; CommonSettings.micMode = MicMode_InternalNoise;
else if(IsDlgCheckboxChecked(hDlg, IDC_USEPHYSICAL)) else if(IsDlgCheckboxChecked(hDlg, IDC_USEPHYSICAL))
CommonSettings.micMode = TCommonSettings::Physical; CommonSettings.micMode = MicMode_Physical;
cur = GetDlgItem(hDlg, IDC_MICSAMPLE); cur = GetDlgItem(hDlg, IDC_MICSAMPLE);
GetWindowText(cur, MicSampleName, 256); GetWindowText(cur, MicSampleName, 256);

4
desmume/src/frontend/windows/mic-win.cpp
View File

@ -388,7 +388,7 @@ u8 Mic_ReadSample()
{ {
u8 ret; u8 ret;
u8 tmp; u8 tmp;
if (CommonSettings.micMode == TCommonSettings::Physical) if (CommonSettings.micMode == MicMode_Physical)
{ {
if (movieMode == MOVIEMODE_INACTIVE) if (movieMode == MOVIEMODE_INACTIVE)
{ {
@ -433,7 +433,7 @@ u8 Mic_ReadSample()
else else
{ {
//use the "random" values //use the "random" values
if (CommonSettings.micMode == TCommonSettings::InternalNoise) if (CommonSettings.micMode == MicMode_InternalNoise)
tmp = random[micReadSamplePos >> 1]; tmp = random[micReadSamplePos >> 1];
else tmp = rand(); else tmp = rand();
micReadSamplePos++; micReadSamplePos++;

6
desmume/src/mic.cpp
View File

@ -121,7 +121,7 @@ u8 Mic_ReadSample(void)
{ {
// All mic modes other than Physical must have the mic hotkey pressed in order // All mic modes other than Physical must have the mic hotkey pressed in order
// to work. // to work.
if (CommonSettings.micMode != TCommonSettings::Physical && !Mic_GetActivate()) { if (CommonSettings.micMode != MicMode_Physical && !Mic_GetActivate()) {
return MIC_NULL_SAMPLE_VALUE; return MIC_NULL_SAMPLE_VALUE;
} }
@ -180,9 +180,9 @@ void Mic_DoNoise(BOOL noise)
if (!noise) { if (!noise) {
generator = &Mic_GenerateNullSample; generator = &Mic_GenerateNullSample;
} else if (CommonSettings.micMode == TCommonSettings::InternalNoise) { } else if (CommonSettings.micMode == MicMode_InternalNoise) {
generator = &Mic_GenerateInternalNoiseSample; generator = &Mic_GenerateInternalNoiseSample;
} else if (CommonSettings.micMode == TCommonSettings::Random) { } else if (CommonSettings.micMode == MicMode_Random) {
generator = &Mic_GenerateWhiteNoiseSample; generator = &Mic_GenerateWhiteNoiseSample;
} }