diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:32 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:32 +0200 |
| commit | 9ba43b5ce9c480ab84adabdf85536c9c14186c05 (patch) | |
| tree | f39554d3a7579fcd42fa686927ec6f84c2938a0e /indra/llaudio/llaudioengine.h | |
| parent | 806345951bcb72ae709cc19a198f78905fcbdb46 (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
Diffstat (limited to 'indra/llaudio/llaudioengine.h')
| -rw-r--r-- | indra/llaudio/llaudioengine.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 97674f15f7..577b36d667 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -50,15 +50,6 @@ const F32 DEFAULT_MIN_DISTANCE = 2.0f; #define MAX_CHANNELS 30 #define MAX_BUFFERS 40 // Some extra for preloading, maybe? -// This define is intended to allow us to switch from os based wav -// file loading to vfs based wav file loading. The problem is that I -// am unconvinced that the LLWaveFile works for loading sounds from -// memory. So, until that is fixed up, changed, whatever, this remains -// undefined. -//#define USE_WAV_VFILE - -class LLVFS; - class LLAudioSource; class LLAudioData; class LLAudioChannel; @@ -67,11 +58,9 @@ class LLAudioBuffer; class LLStreamingAudioInterface; struct SoundData; - // // LLAudioEngine definition // - class LLAudioEngine { friend class LLAudioChannelOpenAL; // bleh. channel needs some listener methods. @@ -182,7 +171,7 @@ public: // Asset callback when we're retrieved a sound from the asset server. void startNextTransfer(); - static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); + static void assetCallback(const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status); friend class LLPipeline; // For debugging public: |