Use SAMPLERATE for consistency with the rest of the code
This commit is contained in:
parent
f626b9f4d9
commit
5708325d2b
|
@ -497,7 +497,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
|
||||||
zErr = inflate(&stream, Z_FINISH);
|
zErr = inflate(&stream, Z_FINISH);
|
||||||
if (zErr == Z_STREAM_END) {
|
if (zErr == Z_STREAM_END) {
|
||||||
// Run GME on new data
|
// Run GME on new data
|
||||||
if (!gme_open_data(inflatedData, inflatedLen, &emu, 44100))
|
if (!gme_open_data(inflatedData, inflatedLen, &emu, SAMPLERATE))
|
||||||
{
|
{
|
||||||
short *mem;
|
short *mem;
|
||||||
UINT32 len;
|
UINT32 len;
|
||||||
|
@ -531,7 +531,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
// Try to read it as a GME sound
|
// Try to read it as a GME sound
|
||||||
else if (!gme_open_data(lump, sfx->length, &emu, 44100))
|
else if (!gme_open_data(lump, sfx->length, &emu, SAMPLERATE))
|
||||||
{
|
{
|
||||||
short *mem;
|
short *mem;
|
||||||
UINT32 len;
|
UINT32 len;
|
||||||
|
@ -1160,7 +1160,7 @@ boolean I_LoadSong(char *data, size_t len)
|
||||||
if (zErr == Z_STREAM_END)
|
if (zErr == Z_STREAM_END)
|
||||||
{
|
{
|
||||||
// Run GME on new data
|
// Run GME on new data
|
||||||
if (!gme_open_data(inflatedData, inflatedLen, &gme, 44100))
|
if (!gme_open_data(inflatedData, inflatedLen, &gme, SAMPLERATE))
|
||||||
{
|
{
|
||||||
Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around
|
Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around
|
||||||
return true;
|
return true;
|
||||||
|
@ -1179,7 +1179,7 @@ boolean I_LoadSong(char *data, size_t len)
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (!gme_open_data(data, len, &gme, 44100))
|
else if (!gme_open_data(data, len, &gme, SAMPLERATE))
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue