mirror of
https://github.com/kevinbentley/Descent3.git
synced 2025-01-22 11:28:56 +00:00
Replace "signed int" with "int32_t"
This commit is contained in:
parent
2147cfa68b
commit
0556786c12
@ -21,7 +21,7 @@
|
||||
|
||||
namespace AudioDecoder {
|
||||
typedef uint32_t uint32;
|
||||
typedef signed int sint32;
|
||||
typedef int32_t sint32;
|
||||
typedef unsigned short uint16;
|
||||
typedef signed short sint16;
|
||||
typedef unsigned char uint8;
|
||||
|
@ -173,7 +173,7 @@ typedef unsigned short FxU16;
|
||||
|
||||
typedef signed short FxI16;
|
||||
|
||||
typedef signed int FxI32;
|
||||
typedef int32_t FxI32;
|
||||
|
||||
typedef uint32_t FxU32;
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "Aencode.h"
|
||||
|
||||
typedef uint32_t uint32;
|
||||
typedef signed int sint32;
|
||||
typedef int32_t sint32;
|
||||
typedef unsigned short uint16;
|
||||
typedef signed short sint16;
|
||||
typedef unsigned char uint8;
|
||||
|
@ -87,7 +87,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
virtual int SetVolume(signed int vol) = 0;
|
||||
virtual int SetVolume(int32_t vol) = 0;
|
||||
|
||||
///////////////////////////
|
||||
// SetPan
|
||||
@ -98,7 +98,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
virtual int SetPan(signed int pan) = 0;
|
||||
virtual int SetPan(int32_t pan) = 0;
|
||||
|
||||
/////////////////////////
|
||||
// Stop
|
||||
|
@ -236,7 +236,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff) {
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol) {
|
||||
if (!buff)
|
||||
return -1;
|
||||
|
||||
@ -278,7 +278,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan) {
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan) {
|
||||
if (!buff)
|
||||
return -1;
|
||||
|
||||
@ -679,7 +679,7 @@ static int TempSoundBufferLen = 0;
|
||||
static uint32_t LinuxSoundMixInMainBuffer(LnxSoundBuffer *dsb, int len) {
|
||||
uint32_t i, ilen, advance = (LnxBuffers[0]->wfx.wBitsPerSample >> 3);
|
||||
unsigned char *buf, *ibuf, *obuf;
|
||||
signed int temp, field;
|
||||
int32_t temp, field;
|
||||
signed short *ibufs, *obufs;
|
||||
|
||||
if (!(dsb->flags & LNXSND_LOOPING)) {
|
||||
|
@ -47,8 +47,8 @@ typedef struct {
|
||||
|
||||
unsigned char *buffer;
|
||||
|
||||
signed int volume;
|
||||
signed int pan;
|
||||
int32_t volume;
|
||||
int32_t pan;
|
||||
|
||||
WAVEFORMATEX wfx;
|
||||
|
||||
@ -90,7 +90,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff);
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol);
|
||||
|
||||
///////////////////////////
|
||||
// LnxSoundBuffer_SetPan
|
||||
@ -101,7 +101,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan);
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan);
|
||||
|
||||
/////////////////////////
|
||||
// LnxSoundBuffer_Stop
|
||||
|
@ -149,7 +149,7 @@ void NF_DECOMP_INIT(bool HI_COLOR_FLAG, tNextFrame *nf) {
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// signed 8-bit y * nf_width
|
||||
signed int nfpk_ShiftY[256];
|
||||
int32_t nfpk_ShiftY[256];
|
||||
|
||||
// Constant tables
|
||||
|
||||
|
@ -236,7 +236,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff) {
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol) {
|
||||
if (!buff)
|
||||
return -1;
|
||||
|
||||
@ -278,7 +278,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan) {
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan) {
|
||||
if (!buff)
|
||||
return -1;
|
||||
|
||||
@ -663,7 +663,7 @@ static int TempSoundBufferLen = 0;
|
||||
static uint32_t LinuxSoundMixInMainBuffer(LnxSoundBuffer *dsb, int len) {
|
||||
uint32_t i, ilen, advance = (LnxBuffers[0]->wfx.wBitsPerSample >> 3);
|
||||
unsigned char *buf, *ibuf, *obuf;
|
||||
signed int temp, field;
|
||||
int32_t temp, field;
|
||||
signed short *ibufs, *obufs;
|
||||
|
||||
if (!(dsb->flags & LNXSND_LOOPING)) {
|
||||
|
@ -82,8 +82,8 @@ typedef struct {
|
||||
|
||||
unsigned char *buffer;
|
||||
|
||||
signed int volume;
|
||||
signed int pan;
|
||||
int32_t volume;
|
||||
int32_t pan;
|
||||
|
||||
WAVEFORMATEX wfx;
|
||||
|
||||
@ -125,7 +125,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff);
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
|
||||
int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol);
|
||||
|
||||
///////////////////////////
|
||||
// LnxSoundBuffer_SetPan
|
||||
@ -136,7 +136,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan);
|
||||
int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan);
|
||||
|
||||
/////////////////////////
|
||||
// LnxSoundBuffer_Stop
|
||||
|
@ -147,7 +147,7 @@ void NF_DECOMP_INIT(bool HI_COLOR_FLAG, tNextFrame *nf) {
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// signed 8-bit y * nf_width
|
||||
signed int nfpk_ShiftY[256];
|
||||
int32_t nfpk_ShiftY[256];
|
||||
|
||||
// Constant tables
|
||||
|
||||
|
@ -93,7 +93,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int SetVolume(signed int vol) { return m_pBuffer->SetVolume(vol); }
|
||||
int SetVolume(int32_t vol) { return m_pBuffer->SetVolume(vol); }
|
||||
|
||||
///////////////////////////
|
||||
// SetPan
|
||||
@ -104,7 +104,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int SetPan(signed int pan) { return m_pBuffer->SetPan(pan); }
|
||||
int SetPan(int32_t pan) { return m_pBuffer->SetPan(pan); }
|
||||
|
||||
/////////////////////////
|
||||
// Stop
|
||||
@ -288,7 +288,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set volume
|
||||
// -2 : Invalid parameters
|
||||
int SetVolume(signed int vol) { return LnxSoundBuffer_SetVolume(m_pBuffer, vol); }
|
||||
int SetVolume(int32_t vol) { return LnxSoundBuffer_SetVolume(m_pBuffer, vol); }
|
||||
|
||||
///////////////////////////
|
||||
// SetPan
|
||||
@ -299,7 +299,7 @@ public:
|
||||
// 0 : no error
|
||||
// -1 : Cannot set pan
|
||||
// -2 : Invalid parameters
|
||||
int SetPan(signed int pan) { return LnxSoundBuffer_SetPan(m_pBuffer, pan); }
|
||||
int SetPan(int32_t pan) { return LnxSoundBuffer_SetPan(m_pBuffer, pan); }
|
||||
|
||||
/////////////////////////
|
||||
// Stop
|
||||
|
Loading…
Reference in New Issue
Block a user