diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-04-03 22:19:33 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2023-04-04 19:44:07 +0200 |
| commit | ba8bcf6520eb4cbcdf93393ecdeda4e6c0bc5846 (patch) | |
| tree | 68b904783dfe614186903ac400f575f533d02d6a /indra/llaudio/llaudioengine_fmodstudio.cpp | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
SL-19042: Replace FMOD with VLC for parcel audio
Diffstat (limited to 'indra/llaudio/llaudioengine_fmodstudio.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmodstudio.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp index ba743020b5..c6313ea289 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.cpp +++ b/indra/llaudio/llaudioengine_fmodstudio.cpp @@ -208,10 +208,6 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title } #endif - // set up our favourite FMOD-native streaming audio implementation if none has already been added - if (!getStreamingAudioImpl()) // no existing implementation added - setStreamingAudioImpl(new LLStreamingAudio_FMODSTUDIO(mSystem)); - LL_INFOS("AppInit") << "LLAudioEngine_FMODSTUDIO::init() FMOD Studio initialized correctly" << LL_ENDL; int r_numbuffers, r_samplerate, r_channels; @@ -253,6 +249,13 @@ std::string LLAudioEngine_FMODSTUDIO::getDriverName(bool verbose) } +// create our favourite FMOD-native streaming audio implementation +LLStreamingAudioInterface *LLAudioEngine_FMODSTUDIO::createDefaultStreamingAudioImpl() const +{ + return new LLStreamingAudio_FMODSTUDIO(mSystem); +} + + void LLAudioEngine_FMODSTUDIO::allocateListener(void) { mListenerp = (LLListener *) new LLListener_FMODSTUDIO(mSystem); |