diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:29:12 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:29:12 +0300 |
| commit | 47d339aa1050b7a42a8b683d93334f56c3dd0755 (patch) | |
| tree | bd18cc37b230de46543d9eea9b6127b20f2cbdff /indra/llaudio/llaudioengine_openal.h | |
| parent | 052be579b6bb19c5a321e4c2d8c9173bcf5b9c34 (diff) | |
| parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) | |
Merge branch 'main' into DRTVWR-588-maint-W
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.h')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |