zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-03 02:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefer uint32_t over unsigned int

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8225 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/audiolib/src/_al_midi.h
This commit is contained in:
terminx 2019-10-19 23:48:51 +00:00 • committed by Christoph Oelckers
parent 4ff4fddf62
commit 5853fe1cc6
8 changed files with 56 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/audiolib/src/fx_man.cpp
View file

@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int FX_ErrorCode = FX_Ok;
int FX_Installed;
const char *FX_ErrorString(int ErrorNumber)
const char *FX_ErrorString(int const ErrorNumber)
{
const char *ErrorString;
@ -63,7 +63,7 @@ static int osdcmd_cvar_set_audiolib(osdcmdptr_t parm)
return r;
}
int FX_Init(int numvoices, int numchannels, unsigned mixrate, void *initdata)
int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata)
{
if (FX_Installed)
FX_Shutdown();
@ -82,9 +82,11 @@ int FX_Init(int numvoices, int numchannels, unsigned mixrate, void *initdata)
OSD_RegisterCvar(&i, (i.flags & CVAR_FUNCPTR) ? osdcmd_cvar_set_audiolib : osdcmd_cvar_set);
}
}
int SoundCard = ASS_AutoDetect;
if (SoundCard == ASS_AutoDetect) {
if (SoundCard == ASS_AutoDetect)
{
#if defined RENDERTYPESDL
SoundCard = ASS_SDL;
#elif defined RENDERTYPEWIN
@ -100,7 +102,6 @@ int FX_Init(int numvoices, int numchannels, unsigned mixrate, void *initdata)
return FX_Error;
}
if (SoundDriver_IsPCMSupported(SoundCard) == 0)
{
// unsupported cards fall back to no sound