Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Refactor : SHORT -> int16_t

Browse Source
This commit is contained in:
Aaron Culliney 2015-06-07 11:40:33 -07:00
parent 57cd12f1cc
commit 7051e6d906
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AY8910.h
View File

@ -33,7 +33,7 @@ void AY8910UpdateSetCycles();
typedef ULONG libspectrum_dword;
typedef uint8_t libspectrum_byte;
typedef SHORT libspectrum_signed_word;
typedef int16_t libspectrum_signed_word;
struct CAY8910;

16
src/audio/mockingboard.c
View File

@ -218,8 +218,8 @@ static const unsigned short g_nMB_NumChannels = 2;
static const DWORD g_dwDSBufferSize = MAX_SAMPLES * sizeof(short) * g_nMB_NumChannels;
#endif
static const SHORT nWaveDataMin = (SHORT)0x8000;
static const SHORT nWaveDataMax = (SHORT)0x7FFF;
static const int16_t nWaveDataMin = (int16_t)0x8000;
static const int16_t nWaveDataMax = (int16_t)0x7FFF;
#ifdef APPLE2IX
static short g_nMixBuffer[MB_BUF_SIZE / sizeof(short)];
@ -887,7 +887,7 @@ static void MB_Update()
//
DWORD dwDSLockedBufferSize0, dwDSLockedBufferSize1;
SHORT *pDSLockedBuffer0, *pDSLockedBuffer1;
int16_t *pDSLockedBuffer0, *pDSLockedBuffer1;
DWORD dwCurrentPlayCursor, dwCurrentWriteCursor;
#ifdef APPLE2IX
@ -1217,7 +1217,7 @@ static void SSI263_Play(unsigned int nPhoneme)
}
DWORD dwDSLockedBufferSize = 0; // Size of the locked DirectSound buffer
SHORT* pDSLockedBuffer;
int16_t* pDSLockedBuffer;
hr = SSI263Voice.lpDSBvoice->Stop();
@ -1225,7 +1225,7 @@ static void SSI263_Play(unsigned int nPhoneme)
return;
unsigned int nPhonemeShortLength = g_nPhonemeInfo[nPhoneme].nLength;
unsigned int nPhonemeByteLength = g_nPhonemeInfo[nPhoneme].nLength * sizeof(SHORT);
unsigned int nPhonemeByteLength = g_nPhonemeInfo[nPhoneme].nLength * sizeof(int16_t);
if(bPause)
{
@ -1288,7 +1288,7 @@ static bool MB_DSInit()
//
DWORD dwDSLockedBufferSize = 0; // Size of the locked DirectSound buffer
SHORT* pDSLockedBuffer;
int16_t* pDSLockedBuffer;
if(!g_bDSAvailable)
return false;
@ -1332,7 +1332,7 @@ static bool MB_DSInit()
for(int i=0; i<sizeof(g_nPhonemeInfo) / sizeof(PHONEME_INFO); i++)
if(g_dwMaxPhonemeLen < g_nPhonemeInfo[i].nLength)
g_dwMaxPhonemeLen = g_nPhonemeInfo[i].nLength;
g_dwMaxPhonemeLen *= sizeof(SHORT);
g_dwMaxPhonemeLen *= sizeof(int16_t);
#endif
return true;
@ -1387,7 +1387,7 @@ static bool MB_DSInit()
bPause = false;
}
unsigned int nPhonemeByteLength = g_nPhonemeInfo[nPhoneme].nLength * sizeof(SHORT);
unsigned int nPhonemeByteLength = g_nPhonemeInfo[nPhoneme].nLength * sizeof(int16_t);
// NB. DSBCAPS_LOCSOFTWARE required for
hr = DSGetSoundBuffer(&SSI263Voice[i], DSBCAPS_CTRLVOLUME+DSBCAPS_CTRLPOSITIONNOTIFY+DSBCAPS_LOCSOFTWARE, nPhonemeByteLength, 22050, 1);

8
src/audio/soundcore.c
View File

@ -58,8 +58,8 @@ bool g_bDisableDirectSound = false;
//-----------------------------------------------------------------------------
bool DSGetLock(LPDIRECTSOUNDBUFFER pVoice, DWORD dwOffset, DWORD dwBytes,
SHORT** ppDSLockedBuffer0, DWORD* pdwDSLockedBufferSize0,
SHORT** ppDSLockedBuffer1, DWORD* pdwDSLockedBufferSize1)
int16_t** ppDSLockedBuffer0, DWORD* pdwDSLockedBufferSize0,
int16_t** ppDSLockedBuffer1, DWORD* pdwDSLockedBufferSize1)
{
DWORD nStatus = 0;
int hr = pVoice->GetStatus(pVoice->_this, &nStatus);
@ -170,7 +170,7 @@ void DSReleaseSoundBuffer(VOICE* pVoice)
bool DSZeroVoiceBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize)
{
DWORD dwDSLockedBufferSize = 0; // Size of the locked DirectSound buffer
SHORT* pDSLockedBuffer;
int16_t* pDSLockedBuffer;
DWORD argX = 0;
@ -212,7 +212,7 @@ bool DSZeroVoiceBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize)
bool DSZeroVoiceWritableBuffer(PVOICE Voice, char* pszDevName, DWORD dwBufferSize)
{
DWORD dwDSLockedBufferSize0=0, dwDSLockedBufferSize1=0;
SHORT *pDSLockedBuffer0, *pDSLockedBuffer1;
int16_t *pDSLockedBuffer0, *pDSLockedBuffer1;
int hr = DSGetLock(Voice->lpDSBvoice,

4
src/audio/soundcore.h
View File

@ -42,8 +42,8 @@ typedef struct
bool DSGetLock(LPDIRECTSOUNDBUFFER pVoice, DWORD dwOffset, DWORD dwBytes,
SHORT** ppDSLockedBuffer0, DWORD* pdwDSLockedBufferSize0,
SHORT** ppDSLockedBuffer1, DWORD* pdwDSLockedBufferSize1);
int16_t** ppDSLockedBuffer0, DWORD* pdwDSLockedBufferSize0,
int16_t** ppDSLockedBuffer1, DWORD* pdwDSLockedBufferSize1);
int DSGetSoundBuffer(VOICE* pVoice, DWORD dwFlags, DWORD dwBufferSize, DWORD nSampleRate, int nChannels);
void DSReleaseSoundBuffer(VOICE* pVoice);

1
src/audio/win-shim.h
View File

@ -33,7 +33,6 @@ typedef unsigned long ULONG;
typedef long LONG;
typedef unsigned int UINT;
typedef char TCHAR;
typedef short SHORT;
typedef long *LPLONG;
typedef void *LPVOID;