MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GetSFXLength: Respect streaming flag (#1640)

Browse source
This commit is contained in:
Gleb Mazovetskiy 2021-04-22 15:19:27 +01:00 • committed by GitHub
commit a043aa4dd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/effects.cpp
View file

@ -10,6 +10,13 @@
#include "sound.h"
namespace devilution {
namespace {
#ifndef DISABLE_STREAMING_SOUNDS
constexpr bool AllowStreaming = true;
#else
constexpr bool AllowStreaming = false;
#endif
} // namespace
int sfxdelay;
_sfx_id sfxdnum = SFX_NONE;
@ -1085,12 +1092,6 @@ void stream_stop()
static void stream_play(TSFX *pSFX, int lVolume, int lPan)
{
#ifndef DISABLE_STREAMING_SOUNDS
constexpr bool kAllowStreaming = true;
#else
constexpr bool kAllowStreaming = false;
#endif
assert(pSFX);
assert(pSFX->bFlags & sfx_STREAM);
stream_stop();
@ -1099,7 +1100,7 @@ static void stream_play(TSFX *pSFX, int lVolume, int lPan)
if (lVolume > VOLUME_MAX)
lVolume = VOLUME_MAX;
if (pSFX->pSnd == nullptr)
pSFX->pSnd = sound_file_load(pSFX->pszName, kAllowStreaming);
pSFX->pSnd = sound_file_load(pSFX->pszName, AllowStreaming);
pSFX->pSnd->DSB->Play(lVolume, lPan, 0);
sgpStreamSFX = pSFX;
}
@ -1414,7 +1415,8 @@ void effects_play_sound(const char *snd_file)
int GetSFXLength(int nSFX)
{
if (sgSFX[nSFX].pSnd == nullptr)
sgSFX[nSFX].pSnd = sound_file_load(sgSFX[nSFX].pszName);
sgSFX[nSFX].pSnd = sound_file_load(sgSFX[nSFX].pszName,
/*stream=*/AllowStreaming && (sgSFX[nSFX].bFlags & sfx_STREAM) != 0);
return sgSFX[nSFX].pSnd->DSB->GetLength();
}