zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove an unnecessary function

This commit is contained in:
Chris Robinson 2013-06-30 04:47:10 -07:00
parent 5d1cd7b7fe
commit 99209c4a2a
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sound/oalsound.cpp
View File

@ -137,18 +137,6 @@ static ALCenum checkALCError(ALCdevice *device, const char *fn, unsigned int ln)
} }
#define getALCError(d) checkALCError((d), __FILE__, __LINE__) #define getALCError(d) checkALCError((d), __FILE__, __LINE__)
static ALsizei GetBufferLength(ALuint buffer, const char *fn, unsigned int ln)
{
ALint bits, channels, size;
alGetBufferi(buffer, AL_BITS, &bits);
alGetBufferi(buffer, AL_CHANNELS, &channels);
alGetBufferi(buffer, AL_SIZE, &size);
if(checkALError(fn, ln) == AL_NO_ERROR)
return (ALsizei)(size / (channels * bits / 8));
return 0;
}
#define getBufferLength(b) GetBufferLength((b), __FILE__, __LINE__)
extern ReverbContainer *ForcedEnvironment; extern ReverbContainer *ForcedEnvironment;
#define PITCH_MULT (0.7937005f) /* Approx. 4 semitones lower; what Nash suggested */ #define PITCH_MULT (0.7937005f) /* Approx. 4 semitones lower; what Nash suggested */
@ -575,9 +563,17 @@ unsigned int OpenALSoundRenderer::GetMSLength(SoundHandle sfx)
unsigned int OpenALSoundRenderer::GetSampleLength(SoundHandle sfx) unsigned int OpenALSoundRenderer::GetSampleLength(SoundHandle sfx)
{ {
if(!sfx.data) if(sfx.data)
return 0; {
return getBufferLength(*((ALuint*)sfx.data)); ALuint buffer = *((ALuint*)sfx.data);
ALint bits, channels, size;
alGetBufferi(buffer, AL_BITS, &bits);
alGetBufferi(buffer, AL_CHANNELS, &channels);
alGetBufferi(buffer, AL_SIZE, &size);
if(getALError() == AL_NO_ERROR)
return (ALsizei)(size / (channels * bits / 8));
}
return 0;
} }
float OpenALSoundRenderer::GetOutputRate() float OpenALSoundRenderer::GetOutputRate()