zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-03 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix screwed up spacing in a few audiolib files. No functional changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7126 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-25 23:33:14 +00:00
parent cbb9018728
commit 890341d3af
4 changed files with 111 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
source/audiolib/src/driver_directsound.cpp
View file

@ -35,20 +35,20 @@ enum {
DSErr_Warning = -2,
DSErr_Error = -1,
DSErr_Ok = 0,
DSErr_Uninitialised,
DSErr_DirectSoundCreate,
DSErr_SetCooperativeLevel,
DSErr_CreateSoundBuffer,
DSErr_CreateSoundBufferSecondary,
DSErr_SetFormat,
DSErr_SetFormatSecondary,
DSErr_Notify,
DSErr_NotifyEvents,
DSErr_SetNotificationPositions,
DSErr_Play,
DSErr_PlaySecondary,
DSErr_CreateThread,
DSErr_CreateMutex
DSErr_Uninitialised,
DSErr_DirectSoundCreate,
DSErr_SetCooperativeLevel,
DSErr_CreateSoundBuffer,
DSErr_CreateSoundBufferSecondary,
DSErr_SetFormat,
DSErr_SetFormatSecondary,
DSErr_Notify,
DSErr_NotifyEvents,
DSErr_SetNotificationPositions,
DSErr_Play,
DSErr_PlaySecondary,
DSErr_CreateThread,
DSErr_CreateMutex
};
static int32_t ErrorCode = DSErr_Ok;
@ -73,34 +73,34 @@ static HANDLE mutex = NULL;
static void FillBufferPortion(char * ptr, int32_t remaining)
{
int32_t len = 0;
char *sptr;
char *sptr;
while (remaining >= len) {
if (MixBufferUsed == MixBufferSize) {
MixCallBack();
while (remaining >= len) {
if (MixBufferUsed == MixBufferSize) {
MixCallBack();
MixBufferUsed = 0;
MixBufferCurrent++;
if (MixBufferCurrent >= MixBufferCount) {
MixBufferCurrent -= MixBufferCount;
}
}
MixBufferUsed = 0;
MixBufferCurrent++;
if (MixBufferCurrent >= MixBufferCount) {
MixBufferCurrent -= MixBufferCount;
}
}
while (remaining >= len && MixBufferUsed < MixBufferSize) {
sptr = MixBuffer + (MixBufferCurrent * MixBufferSize) + MixBufferUsed;
while (remaining >= len && MixBufferUsed < MixBufferSize) {
sptr = MixBuffer + (MixBufferCurrent * MixBufferSize) + MixBufferUsed;
len = MixBufferSize - MixBufferUsed;
if (remaining < len) {
len = remaining;
}
len = MixBufferSize - MixBufferUsed;
if (remaining < len) {
len = remaining;
}
memcpy(ptr, sptr, len);
memcpy(ptr, sptr, len);
ptr += len;
MixBufferUsed += len;
remaining -= len;
}
}
ptr += len;
MixBufferUsed += len;
remaining -= len;
}
}
}
static void FillBuffer(int32_t bufnum)
@ -156,7 +156,7 @@ static DWORD WINAPI fillDataThread(LPVOID lpParameter)
UNREFERENCED_PARAMETER(lpParameter);
do {
do {
waitret = WaitForMultipleObjects(3, handles, FALSE, INFINITE);
switch (waitret) {
case WAIT_OBJECT_0:
@ -179,23 +179,23 @@ static DWORD WINAPI fillDataThread(LPVOID lpParameter)
MV_Printf( "DirectSound fillDataThread: wfmo err %d\n", (int32_t) waitret);
break;
}
} while (1);
} while (1);
return 0;
return 0;
}
int32_t DirectSoundDrv_GetError(void)
{
return ErrorCode;
return ErrorCode;
}
const char *DirectSoundDrv_ErrorString( int32_t ErrorNumber )
{
const char *ErrorString;
const char *ErrorString;
switch( ErrorNumber )
{
{
case DSErr_Warning :
case DSErr_Error :
ErrorString = DirectSoundDrv_ErrorString( ErrorCode );
@ -205,11 +205,11 @@ const char *DirectSoundDrv_ErrorString( int32_t ErrorNumber )
ErrorString = "DirectSound ok.";
break;
case DSErr_Uninitialised:
ErrorString = "DirectSound uninitialised.";
break;
case DSErr_Uninitialised:
ErrorString = "DirectSound uninitialised.";
break;
case DSErr_DirectSoundCreate:
case DSErr_DirectSoundCreate:
ErrorString = "DirectSound error: DirectSoundCreate failed.";
break;
@ -261,12 +261,12 @@ const char *DirectSoundDrv_ErrorString( int32_t ErrorNumber )
ErrorString = "DirectSound error: failed creating mix mutex.";
break;
default:
ErrorString = "Unknown DirectSound error code.";
break;
}
default:
ErrorString = "Unknown DirectSound error code.";
break;
}
return ErrorString;
return ErrorString;
}
@ -409,7 +409,7 @@ int32_t DirectSoundDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, void * i
// initprintf("DirectSound Init: yay\n");
return DSErr_Ok;
return DSErr_Ok;
}
void DirectSoundDrv_PCM_Shutdown(void)
@ -426,7 +426,7 @@ void DirectSoundDrv_PCM_Shutdown(void)
}
int32_t DirectSoundDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
{
HRESULT err;
@ -437,18 +437,18 @@ int32_t DirectSoundDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
DirectSoundDrv_PCM_StopPlayback();
MixBuffer = BufferStart;
MixBufferSize = BufferSize;
MixBufferCount = NumDivisions;
MixBufferCurrent = 0;
MixBufferUsed = 0;
MixCallBack = CallBackFunc;
MixBuffer = BufferStart;
MixBufferSize = BufferSize;
MixBufferCount = NumDivisions;
MixBufferCurrent = 0;
MixBufferUsed = 0;
MixCallBack = CallBackFunc;
// prime the buffer
FillBuffer(0);
// prime the buffer
FillBuffer(0);
mixThread = CreateThread(NULL, 0, fillDataThread, 0, 0, 0);
if (!mixThread) {
mixThread = CreateThread(NULL, 0, fillDataThread, 0, 0, 0);
if (!mixThread) {
ErrorCode = DSErr_CreateThread;
return DSErr_Error;
}
@ -463,7 +463,7 @@ int32_t DirectSoundDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
Playing = 1;
return DSErr_Ok;
return DSErr_Ok;
}
void DirectSoundDrv_PCM_StopPlayback(void)

2
source/audiolib/src/driver_nosound.cpp
View file

@ -49,7 +49,7 @@ void NoSoundDrv_PCM_Shutdown(void)
}
int32_t NoSoundDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
{
UNREFERENCED_PARAMETER(BufferStart);
UNREFERENCED_PARAMETER(BufferSize);

90
source/audiolib/src/driver_sdl.cpp
View file

@ -61,8 +61,8 @@ static SDL_mutex *EffectFence;
static void fillData(int chan, void *ptr, int remaining, void *udata)
{
int32_t len;
char *sptr;
int32_t len;
char *sptr;
UNREFERENCED_PARAMETER(chan);
UNREFERENCED_PARAMETER(udata);
@ -72,32 +72,32 @@ static void fillData(int chan, void *ptr, int remaining, void *udata)
SDL_LockMutex(EffectFence);
while (remaining > 0) {
if (MixBufferUsed == MixBufferSize) {
MixCallBack();
while (remaining > 0) {
if (MixBufferUsed == MixBufferSize) {
MixCallBack();
MixBufferUsed = 0;
MixBufferCurrent++;
if (MixBufferCurrent >= MixBufferCount) {
MixBufferCurrent -= MixBufferCount;
}
}
MixBufferUsed = 0;
MixBufferCurrent++;
if (MixBufferCurrent >= MixBufferCount) {
MixBufferCurrent -= MixBufferCount;
}
}
while (remaining > 0 && MixBufferUsed < MixBufferSize) {
sptr = MixBuffer + (MixBufferCurrent * MixBufferSize) + MixBufferUsed;
while (remaining > 0 && MixBufferUsed < MixBufferSize) {
sptr = MixBuffer + (MixBufferCurrent * MixBufferSize) + MixBufferUsed;
len = MixBufferSize - MixBufferUsed;
if (remaining < len) {
len = remaining;
}
len = MixBufferSize - MixBufferUsed;
if (remaining < len) {
len = remaining;
}
memcpy(ptr, sptr, len);
memcpy(ptr, sptr, len);
ptr = (void *)((uintptr_t)(ptr) + len);
MixBufferUsed += len;
remaining -= len;
}
}
ptr = (void *)((uintptr_t)(ptr) + len);
MixBufferUsed += len;
remaining -= len;
}
}
SDL_UnlockMutex(EffectFence);
}
@ -249,43 +249,43 @@ void SDLDrv_PCM_Shutdown(void)
}
int32_t SDLDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
int32_t NumDivisions, void ( *CallBackFunc )( void ) )
{
if (!Initialised) {
ErrorCode = SDLErr_Uninitialised;
return SDLErr_Error;
}
if (!Initialised) {
ErrorCode = SDLErr_Uninitialised;
return SDLErr_Error;
}
if (Playing) {
SDLDrv_PCM_StopPlayback();
}
if (Playing) {
SDLDrv_PCM_StopPlayback();
}
MixBuffer = BufferStart;
MixBufferSize = BufferSize;
MixBufferCount = NumDivisions;
MixBufferCurrent = 0;
MixBufferUsed = 0;
MixCallBack = CallBackFunc;
MixBuffer = BufferStart;
MixBufferSize = BufferSize;
MixBufferCount = NumDivisions;
MixBufferCurrent = 0;
MixBufferUsed = 0;
MixCallBack = CallBackFunc;
// prime the buffer
MixCallBack();
// prime the buffer
MixCallBack();
Mix_Resume(-1);
Mix_Resume(-1);
Playing = 1;
return SDLErr_Ok;
return SDLErr_Ok;
}
void SDLDrv_PCM_StopPlayback(void)
{
if (!Initialised || !Playing) {
return;
}
if (!Initialised || !Playing) {
return;
}
Mix_Pause(-1);
Playing = 0;
Playing = 0;
}
void SDLDrv_PCM_Lock(void)

2
source/audiolib/src/drivers.cpp
View file

@ -55,7 +55,7 @@ static struct
NoSoundDrv_PCM_BeginPlayback, NoSoundDrv_PCM_StopPlayback, NoSoundDrv_PCM_Lock, NoSoundDrv_PCM_Unlock,
},
// Windows DirectSound
// Windows DirectSound
#if defined MIXERTYPEWIN
{
DirectSoundDrv_GetError, DirectSoundDrv_ErrorString, DirectSoundDrv_PCM_Init, DirectSoundDrv_PCM_Shutdown,