-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restore EAX effects through OpenAL's EFX.
- Loading branch information
Showing
9 changed files
with
422 additions
and
395 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,9 +42,6 @@ You can contact Cyan Worlds, Inc. by email [email protected] | |
#include "HeadSpin.h" | ||
#include <al.h> | ||
#include <efx.h> | ||
#ifdef EAX_SDK_AVAILABLE | ||
#include <eax.h> | ||
#endif | ||
#include <memory> | ||
#include <array> | ||
|
||
|
@@ -304,6 +301,7 @@ bool plAudioSystem::Init() | |
plStatusLog::AddLineSF("audio.log", "OpenAL version: {}", alGetString(AL_VERSION)); | ||
plStatusLog::AddLineSF("audio.log", "OpenAL renderer: {}", alGetString(AL_RENDERER)); | ||
plStatusLog::AddLineSF("audio.log", "OpenAL extensions: {}", alGetString(AL_EXTENSIONS)); | ||
plStatusLog::AddLineSF("audio.log", "OpenAL context extensions: {}", alcGetString(fPlaybackDevice, ALC_EXTENSIONS)); | ||
plStatusLog::AddLineS("audio.log", plStatusLog::kGreen, "ASYS: Detecting caps..."); | ||
|
||
// Detect maximum number of voices that can be created. | ||
|
@@ -323,15 +321,15 @@ bool plAudioSystem::Init() | |
plStatusLog::AddLineSF("audio.log", "Max Number of sources: {}", fMaxNumSources); | ||
SetMaxNumberOfActiveSounds(); | ||
|
||
// TODO: Detect EAX support. Not adding this in now until the replacement is implemented. | ||
// TODO: Detect EFX support. | ||
|
||
// attempt to init the EAX listener. | ||
if (plgAudioSys::fEnableEAX) { | ||
fUsingEAX = plEAXListener::GetInstance().Init(); | ||
// attempt to init the EFX listener. | ||
if (true || plgAudioSys::fEnableEAX) { | ||
fUsingEAX = plEAXListener::GetInstance().Init(fPlaybackDevice); | ||
if (fUsingEAX) | ||
plStatusLog::AddLineS("audio.log", plStatusLog::kGreen, "ASYS: EAX support detected and enabled."); | ||
plStatusLog::AddLineS("audio.log", plStatusLog::kGreen, "ASYS: EFX support detected and enabled."); | ||
else | ||
plStatusLog::AddLineS("audio.log", plStatusLog::kRed, "ASYS: EAX support NOT detected. EAX effects disabled."); | ||
plStatusLog::AddLineS("audio.log", plStatusLog::kRed, "ASYS: EFX support NOT detected. EAX effects disabled."); | ||
} else { | ||
fUsingEAX = false; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,9 +47,6 @@ You can contact Cyan Worlds, Inc. by email [email protected] | |
#include <al.h> | ||
#include <alc.h> | ||
#include <efx.h> | ||
#ifdef EAX_SDK_AVAILABLE | ||
#include <eax.h> | ||
#endif | ||
#include <memory> | ||
#include <set> | ||
|
||
|
Oops, something went wrong.