diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-01-19 11:36:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 11:36:56 -0600 |
| commit | 6dd260c3699148b4ddf8e7bff84f4b19f8bbf076 (patch) | |
| tree | 6c9144f701ecb2cda859baaeed4e2f4ee6f9a683 /indra/llaudio | |
| parent | 45547c7bbadf15804f54bb28fd1c94eb5f080bf5 (diff) | |
| parent | 09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff) | |
Merge branch 'release/materials_featurette' into DRTVWR-592
Diffstat (limited to 'indra/llaudio')
| -rwxr-xr-x | indra/llaudio/llaudioengine.h | 1 | ||||
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index a133898969..c045d18c42 100755 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -30,6 +30,7 @@ #include <list> #include <map> +#include <array> #include "v3math.h" #include "v3dmath.h" diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index a3cab97cd2..562c96c794 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -42,6 +42,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine virtual bool init(void *user_data, const std::string &app_title); virtual std::string getDriverName(bool verbose); + virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const { return nullptr; } virtual void allocateListener(); virtual void shutdown(); @@ -56,7 +57,6 @@ class LLAudioEngine_OpenAL : public LLAudioEngine /*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude); private: - void * windDSP(void *newbuffer, int length); typedef S16 WIND_SAMPLE_T; LLWindGen<WIND_SAMPLE_T> *mWindGen; S16 *mWindBuf; |