From 4d12a23c68199693707eca09003c9754e82ed9a9 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 24 Nov 2019 15:57:33 +0000 Subject: [PATCH] Make soundtype default to WAVE (not NONE)! (#355) --- source/Applewin.cpp | 2 +- source/Common.h | 1 + source/Configuration/PageSound.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/Applewin.cpp b/source/Applewin.cpp index 4d76f89a..cb50d1fb 100644 --- a/source/Applewin.cpp +++ b/source/Applewin.cpp @@ -630,7 +630,7 @@ void LoadConfiguration(void) LoadConfigOldJoystick_v1(JN_JOYSTICK1); DWORD dwSoundType; - REGLOAD_DEFAULT(TEXT("Sound Emulation"), &dwSoundType, REG_SOUNDTYPE_NONE); + REGLOAD_DEFAULT(TEXT(REGVALUE_SOUND_EMULATION), &dwSoundType, REG_SOUNDTYPE_WAVE); switch (dwSoundType) { case REG_SOUNDTYPE_NONE: diff --git a/source/Common.h b/source/Common.h index 8097d02e..fd55f0f7 100644 --- a/source/Common.h +++ b/source/Common.h @@ -67,6 +67,7 @@ enum AppMode_e #define REGVALUE_OLD_APPLE2_TYPE "Computer Emulation" // Deprecated #define REGVALUE_CONFIRM_REBOOT "Confirm Reboot" // Added at 1.24.1 PageConfig #define REGVALUE_FS_SHOW_SUBUNIT_STATUS "Full-screen show subunit status" +#define REGVALUE_SOUND_EMULATION "Sound Emulation" #define REGVALUE_SPKR_VOLUME "Speaker Volume" #define REGVALUE_MB_VOLUME "Mockingboard Volume" #define REGVALUE_SAVESTATE_FILENAME "Save State Filename" diff --git a/source/Configuration/PageSound.cpp b/source/Configuration/PageSound.cpp index 4d91cf83..59fe9a6e 100644 --- a/source/Configuration/PageSound.cpp +++ b/source/Configuration/PageSound.cpp @@ -140,7 +140,7 @@ void CPageSound::DlgOK(HWND hWnd) if (SpkrSetEmulationType(hWnd, newSoundType)) { DWORD dwSoundType = (soundtype == SOUND_NONE) ? REG_SOUNDTYPE_NONE : REG_SOUNDTYPE_WAVE; - REGSAVE(TEXT("Sound Emulation"), dwSoundType); + REGSAVE(TEXT(REGVALUE_SOUND_EMULATION), dwSoundType); } // NB. Volume: 0=Loudest, VOLUME_MAX=Silence