empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/cppfixes'

Browse source
This commit is contained in:
Andrea Odetti 2020-06-22 16:09:17 +01:00
commit 507e316dfc
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/AY8910.cpp
View file

@ -26,9 +26,7 @@
#include "StdAfx.h" #include "StdAfx.h"
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <crtdbg.h>
#include "AY8910.h" #include "AY8910.h"
#include "Applewin.h" // For g_fh #include "Applewin.h" // For g_fh
@ -991,7 +989,7 @@ sound_beeper( int is_tape, int on )
#define SS_YAML_KEY_CHANGE "Change" #define SS_YAML_KEY_CHANGE "Change"
#define SS_YAML_VALUE_CHANGE_FORMAT "%d, %d, 0x%1X, 0x%02X" #define SS_YAML_VALUE_CHANGE_FORMAT "%d, %d, 0x%1X, 0x%02X"
void CAY8910::SaveSnapshot(YamlSaveHelper& yamlSaveHelper, std::string& suffix) void CAY8910::SaveSnapshot(YamlSaveHelper& yamlSaveHelper, const std::string& suffix)
{ {
std::string unit = std::string(SS_YAML_KEY_AY8910) + suffix; std::string unit = std::string(SS_YAML_KEY_AY8910) + suffix;
YamlSaveHelper::Label label(yamlSaveHelper, "%s:\n", unit.c_str()); YamlSaveHelper::Label label(yamlSaveHelper, "%s:\n", unit.c_str());
@ -1046,7 +1044,7 @@ void CAY8910::SaveSnapshot(YamlSaveHelper& yamlSaveHelper, std::string& suffix)
} }
} }
bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, std::string& suffix) bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, const std::string& suffix)
{ {
std::string unit = std::string(SS_YAML_KEY_AY8910) + suffix; std::string unit = std::string(SS_YAML_KEY_AY8910) + suffix;
if (!yamlLoadHelper.GetSubMap(unit)) if (!yamlLoadHelper.GetSubMap(unit))
@ -1201,7 +1199,7 @@ BYTE* AY8910_GetRegsPtr(UINT uChip)
return g_AY8910[uChip].GetAYRegsPtr(); return g_AY8910[uChip].GetAYRegsPtr();
} }
UINT AY8910_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, UINT uChip, std::string& suffix) UINT AY8910_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, UINT uChip, const std::string& suffix)
{ {
if (uChip >= MAX_8910) if (uChip >= MAX_8910)
return 0; return 0;
@ -1210,7 +1208,7 @@ UINT AY8910_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, UINT uChip, std::string
return 1; return 1;
} }
UINT AY8910_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT uChip, std::string& suffix) UINT AY8910_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT uChip, const std::string& suffix)
{ {
if (uChip >= MAX_8910) if (uChip >= MAX_8910)
return 0; return 0;

8
source/AY8910.h
View file

@ -17,8 +17,8 @@ BYTE* AY8910_GetRegsPtr(UINT uChip);
void AY8910UpdateSetCycles(); void AY8910UpdateSetCycles();
UINT AY8910_SaveSnapshot(class YamlSaveHelper& yamlSaveHelper, UINT uChip, std::string& suffix); UINT AY8910_SaveSnapshot(class YamlSaveHelper& yamlSaveHelper, UINT uChip, const std::string& suffix);
UINT AY8910_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT uChip, std::string& suffix); UINT AY8910_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT uChip, const std::string& suffix);
//------------------------------------- //-------------------------------------
// FUSE stuff // FUSE stuff
@ -46,8 +46,8 @@ public:
void sound_frame( void ); void sound_frame( void );
BYTE* GetAYRegsPtr( void ) { return &sound_ay_registers[0]; } BYTE* GetAYRegsPtr( void ) { return &sound_ay_registers[0]; }
static void SetCLK( double CLK ) { m_fCurrentCLK_AY8910 = CLK; } static void SetCLK( double CLK ) { m_fCurrentCLK_AY8910 = CLK; }
void SaveSnapshot(class YamlSaveHelper& yamlSaveHelper, std::string& suffix); void SaveSnapshot(class YamlSaveHelper& yamlSaveHelper, const std::string& suffix);
bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, std::string& suffix); bool LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, const std::string& suffix);
private: private:
void init( void ); void init( void );

4
source/Mockingboard.cpp
View file

@ -555,7 +555,7 @@ static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void SSI263_Play(unsigned int nPhoneme); static void SSI263_Play(unsigned int nPhoneme);
#if 0 #if 0
typedef struct typedef struct
@ -1510,7 +1510,7 @@ void MB_Initialize()
g_bCritSectionValid = true; g_bCritSectionValid = true;
} }
void MB_SetSoundcardType(SS_CARDTYPE NewSoundcardType); static void MB_SetSoundcardType(SS_CARDTYPE NewSoundcardType);
// NB. Mockingboard voice is *already* muted because showing 'Select Load State file' dialog // NB. Mockingboard voice is *already* muted because showing 'Select Load State file' dialog
// . and voice will be demuted when dialog is closed // . and voice will be demuted when dialog is closed

4
source/SoundCore.cpp
View file

@ -224,7 +224,7 @@ void DSReleaseSoundBuffer(VOICE* pVoice)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool DSZeroVoiceBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize) bool DSZeroVoiceBuffer(PVOICE Voice, const char* pszDevName, DWORD dwBufferSize)
{ {
#ifdef NO_DIRECT_X #ifdef NO_DIRECT_X
@ -273,7 +273,7 @@ bool DSZeroVoiceBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool DSZeroVoiceWritableBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize) bool DSZeroVoiceWritableBuffer(PVOICE Voice, const char* pszDevName, DWORD dwBufferSize)
{ {
DWORD dwDSLockedBufferSize0=0, dwDSLockedBufferSize1=0; DWORD dwDSLockedBufferSize0=0, dwDSLockedBufferSize1=0;
SHORT *pDSLockedBuffer0, *pDSLockedBuffer1; SHORT *pDSLockedBuffer0, *pDSLockedBuffer1;

4
source/SoundCore.h
View file

@ -29,8 +29,8 @@ bool DSGetLock(LPDIRECTSOUNDBUFFER pVoice, DWORD dwOffset, DWORD dwBytes,
HRESULT DSGetSoundBuffer(VOICE* pVoice, DWORD dwFlags, DWORD dwBufferSize, DWORD nSampleRate, int nChannels); HRESULT DSGetSoundBuffer(VOICE* pVoice, DWORD dwFlags, DWORD dwBufferSize, DWORD nSampleRate, int nChannels);
void DSReleaseSoundBuffer(VOICE* pVoice); void DSReleaseSoundBuffer(VOICE* pVoice);
bool DSZeroVoiceBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize); bool DSZeroVoiceBuffer(PVOICE Voice, const char* pszDevName, DWORD dwBufferSize);
bool DSZeroVoiceWritableBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize); bool DSZeroVoiceWritableBuffer(PVOICE Voice, const char* pszDevName, DWORD dwBufferSize);
enum eFADE {FADE_NONE, FADE_IN, FADE_OUT}; enum eFADE {FADE_NONE, FADE_IN, FADE_OUT};
void SoundCore_SetFade(eFADE FadeType); void SoundCore_SetFade(eFADE FadeType);