zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 09:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pause OpenAL processing using ALC_SOFT_pause_device when inactive

Browse source
This commit is contained in:
Chris Robinson 2016-05-02 14:23:07 -07:00 committed by Christoph Oelckers
parent e1c8890c5e
commit 26a8a8a1ba
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/sound/oalsound.cpp
View file

@ -690,7 +690,12 @@ template<typename T>
static void LoadALFunc(const char *name, T *x) static void LoadALFunc(const char *name, T *x)
{ *x = reinterpret_cast<T>(alGetProcAddress(name)); } { *x = reinterpret_cast<T>(alGetProcAddress(name)); }
template<typename T>
static void LoadALCFunc(ALCdevice *device, const char *name, T *x)
{ *x = reinterpret_cast<T>(alcGetProcAddress(device, name)); }
#define LOAD_FUNC(x) (LoadALFunc(#x, &x)) #define LOAD_FUNC(x) (LoadALFunc(#x, &x))
#define LOAD_DEV_FUNC(d, x) (LoadALCFunc(d, #x, &x))
OpenALSoundRenderer::OpenALSoundRenderer() OpenALSoundRenderer::OpenALSoundRenderer()
: Device(NULL), Context(NULL), SFXPaused(0), PrevEnvironment(NULL), EnvSlot(0) : Device(NULL), Context(NULL), SFXPaused(0), PrevEnvironment(NULL), EnvSlot(0)
{ {
@ -748,7 +753,8 @@ OpenALSoundRenderer::OpenALSoundRenderer()
DPrintf(" Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); DPrintf(" Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS));
ALC.EXT_EFX = !!alcIsExtensionPresent(Device, "ALC_EXT_EFX"); ALC.EXT_EFX = !!alcIsExtensionPresent(Device, "ALC_EXT_EFX");
ALC.EXT_disconnect = !!alcIsExtensionPresent(Device, "ALC_EXT_disconnect");; ALC.EXT_disconnect = !!alcIsExtensionPresent(Device, "ALC_EXT_disconnect");
ALC.SOFT_pause_device = !!alcIsExtensionPresent(Device, "ALC_SOFT_pause_device");
AL.EXT_source_distance_model = !!alIsExtensionPresent("AL_EXT_source_distance_model"); AL.EXT_source_distance_model = !!alIsExtensionPresent("AL_EXT_source_distance_model");
AL.EXT_SOURCE_RADIUS = !!alIsExtensionPresent("AL_EXT_SOURCE_RADIUS"); AL.EXT_SOURCE_RADIUS = !!alIsExtensionPresent("AL_EXT_SOURCE_RADIUS");
AL.SOFT_deferred_updates = !!alIsExtensionPresent("AL_SOFT_deferred_updates"); AL.SOFT_deferred_updates = !!alIsExtensionPresent("AL_SOFT_deferred_updates");
@ -771,6 +777,12 @@ OpenALSoundRenderer::OpenALSoundRenderer()
alProcessUpdatesSOFT = _wrap_ProcessUpdatesSOFT; alProcessUpdatesSOFT = _wrap_ProcessUpdatesSOFT;
} }
if(ALC.SOFT_pause_device)
{
LOAD_DEV_FUNC(Device, alcDevicePauseSOFT);
LOAD_DEV_FUNC(Device, alcDeviceResumeSOFT);
}
ALenum err = getALError(); ALenum err = getALError();
if(err != AL_NO_ERROR) if(err != AL_NO_ERROR)
{ {
@ -910,6 +922,7 @@ OpenALSoundRenderer::OpenALSoundRenderer()
if(EnvSlot) if(EnvSlot)
Printf(" EFX enabled\n"); Printf(" EFX enabled\n");
} }
#undef LOAD_DEV_FUNC
#undef LOAD_FUNC #undef LOAD_FUNC
OpenALSoundRenderer::~OpenALSoundRenderer() OpenALSoundRenderer::~OpenALSoundRenderer()
@ -1599,10 +1612,14 @@ void OpenALSoundRenderer::SetInactive(SoundRenderer::EInactiveState state)
{ {
case SoundRenderer::INACTIVE_Active: case SoundRenderer::INACTIVE_Active:
alListenerf(AL_GAIN, 1.0f); alListenerf(AL_GAIN, 1.0f);
if(ALC.SOFT_pause_device)
alcDeviceResumeSOFT(Device);
break; break;
/* FIXME: This doesn't stop anything. */
case SoundRenderer::INACTIVE_Complete: case SoundRenderer::INACTIVE_Complete:
if(ALC.SOFT_pause_device)
alcDevicePauseSOFT(Device);
/* fall-through */
case SoundRenderer::INACTIVE_Mute: case SoundRenderer::INACTIVE_Mute:
alListenerf(AL_GAIN, 0.0f); alListenerf(AL_GAIN, 0.0f);
break; break;

4
src/sound/oalsound.h
View file

@ -129,6 +129,7 @@ private:
struct { struct {
bool EXT_EFX; bool EXT_EFX;
bool EXT_disconnect; bool EXT_disconnect;
bool SOFT_pause_device;
} ALC; } ALC;
struct { struct {
bool EXT_source_distance_model; bool EXT_source_distance_model;
@ -180,6 +181,9 @@ private:
ALvoid (AL_APIENTRY*alDeferUpdatesSOFT)(void); ALvoid (AL_APIENTRY*alDeferUpdatesSOFT)(void);
ALvoid (AL_APIENTRY*alProcessUpdatesSOFT)(void); ALvoid (AL_APIENTRY*alProcessUpdatesSOFT)(void);
void (ALC_APIENTRY*alcDevicePauseSOFT)(ALCdevice *device);
void (ALC_APIENTRY*alcDeviceResumeSOFT)(ALCdevice *device);
void LoadReverb(const ReverbContainer *env); void LoadReverb(const ReverbContainer *env);
void PurgeStoppedSources(); void PurgeStoppedSources();
static FSoundChan *FindLowestChannel(); static FSoundChan *FindLowestChannel();