Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SpkrSetEmulationType(): simplify logic and remove unreachable code. (PR #919)

This commit is contained in:
Andrea 2021-01-20 21:30:34 +00:00 committed by GitHub
parent cdf1cb9106
commit baad40f3b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Configuration/PageSound.cpp
View File

@ -139,11 +139,9 @@ void CPageSound::DlgOK(HWND hWnd)
const DWORD dwSpkrVolume = SendDlgItemMessage(hWnd, IDC_SPKR_VOLUME, TBM_GETPOS, 0, 0); const DWORD dwSpkrVolume = SendDlgItemMessage(hWnd, IDC_SPKR_VOLUME, TBM_GETPOS, 0, 0);
const DWORD dwMBVolume = SendDlgItemMessage(hWnd, IDC_MB_VOLUME, TBM_GETPOS, 0, 0); const DWORD dwMBVolume = SendDlgItemMessage(hWnd, IDC_MB_VOLUME, TBM_GETPOS, 0, 0);
if (SpkrSetEmulationType(hWnd, newSoundType)) SpkrSetEmulationType(newSoundType);
{ DWORD dwSoundType = (soundtype == SOUND_NONE) ? REG_SOUNDTYPE_NONE : REG_SOUNDTYPE_WAVE;
DWORD dwSoundType = (soundtype == SOUND_NONE) ? REG_SOUNDTYPE_NONE : REG_SOUNDTYPE_WAVE; REGSAVE(TEXT(REGVALUE_SOUND_EMULATION), dwSoundType);
REGSAVE(TEXT(REGVALUE_SOUND_EMULATION), dwSoundType);
}
// NB. Volume: 0=Loudest, VOLUME_MAX=Silence // NB. Volume: 0=Loudest, VOLUME_MAX=Silence
SpkrSetVolume(dwSpkrVolume, VOLUME_MAX); SpkrSetVolume(dwSpkrVolume, VOLUME_MAX);

33
source/Speaker.cpp
View File

@ -241,6 +241,18 @@ void SpkrInitialize ()
else else
{ {
g_bSpkrAvailable = Spkr_DSInit(); g_bSpkrAvailable = Spkr_DSInit();
if (!g_bSpkrAvailable)
{
GetFrame().FrameMessageBox(
TEXT("The emulator is unable to initialize a waveform ")
TEXT("output device. Make sure you have a sound card ")
TEXT("and a driver installed and that Windows is ")
TEXT("correctly configured to use the driver. Also ")
TEXT("ensure that no other program is currently using ")
TEXT("the device."),
TEXT("Configuration"),
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
}
} }
// //
@ -280,32 +292,13 @@ void SpkrReset()
//============================================================================= //=============================================================================
BOOL SpkrSetEmulationType (HWND window, SoundType_e newtype) void SpkrSetEmulationType (SoundType_e newtype)
{ {
SpkrDestroy(); // GH#295: Destroy for all types (even SOUND_NONE) SpkrDestroy(); // GH#295: Destroy for all types (even SOUND_NONE)
soundtype = newtype; soundtype = newtype;
if (soundtype != SOUND_NONE) if (soundtype != SOUND_NONE)
SpkrInitialize(); SpkrInitialize();
if (soundtype != newtype)
switch (newtype) {
case SOUND_WAVE:
MessageBox(window,
TEXT("The emulator is unable to initialize a waveform ")
TEXT("output device. Make sure you have a sound card ")
TEXT("and a driver installed and that windows is ")
TEXT("correctly configured to use the driver. Also ")
TEXT("ensure that no other program is currently using ")
TEXT("the device."),
TEXT("Configuration"),
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
return 0;
}
return 1;
} }
//============================================================================= //=============================================================================

2
source/Speaker.h
View File

@ -21,7 +21,7 @@ void SpkrDestroy ();
void SpkrInitialize (); void SpkrInitialize ();
void SpkrReinitialize (); void SpkrReinitialize ();
void SpkrReset(); void SpkrReset();
BOOL SpkrSetEmulationType (HWND window, SoundType_e newSoundType); void SpkrSetEmulationType (SoundType_e newSoundType);
void SpkrUpdate (DWORD); void SpkrUpdate (DWORD);
void SpkrUpdate_Timer(); void SpkrUpdate_Timer();
DWORD SpkrGetVolume(); DWORD SpkrGetVolume();