diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-10-25 13:22:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-10-25 16:12:13 -0700 |
| commit | 673b3309dde153fdadf7559bd16a5bb6db4723a1 (patch) | |
| tree | 726d5e38b016d1d5504c3024b0959cec00d6c9c1 /indra/llaudio | |
| parent | 887226c7d2462306191126cc5bfc0de96e18ad42 (diff) | |
| parent | e4d6a08941f9c4e81bda8ae14d481be5029353fd (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
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; |