diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp index 070dfeadab8790d21c1cd0393daa6d1c038deb51..1f6abe539e1c82735520a81a2c9b090d36da697d 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.cpp +++ b/indra/llaudio/llaudioengine_fmodstudio.cpp @@ -251,8 +251,6 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata) LL_INFOS("AppInit") << "LLAudioEngine_FMODSTUDIO::init() FMOD Studio initialized correctly" << LL_ENDL; - mSystem->getMasterChannelGroup(&mMasterGroup); - int r_numbuffers, r_samplerate, r_channels; unsigned int r_bufferlength; mSystem->getDSPBufferSize(&r_bufferlength, &r_numbuffers); diff --git a/indra/llaudio/llaudioengine_fmodstudio.h b/indra/llaudio/llaudioengine_fmodstudio.h index 6b2f89e865362ff35528e8001389192c9e7821ac..082fce1b969c2477486f226e0a61c2539125a239 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.h +++ b/indra/llaudio/llaudioengine_fmodstudio.h @@ -77,7 +77,6 @@ protected: FMOD_DSP_DESCRIPTION *mWindDSPDesc; FMOD::DSP *mWindDSP; - FMOD::ChannelGroup *mMasterGroup; FMOD::System *mSystem; bool mEnableProfiler; diff --git a/indra/llaudio/llstreamingaudio_fmodstudio.cpp b/indra/llaudio/llstreamingaudio_fmodstudio.cpp index d07f4c43cd5fcc84d5e33cfb5a043dab1a77977a..32d5f0eb0958d433d5bab29f96f681fc7ff6108b 100644 --- a/indra/llaudio/llstreamingaudio_fmodstudio.cpp +++ b/indra/llaudio/llstreamingaudio_fmodstudio.cpp @@ -70,14 +70,6 @@ LLStreamingAudio_FMODSTUDIO::LLStreamingAudio_FMODSTUDIO(FMOD::System *system) : const U32 buffer_seconds = 10; //sec const U32 estimated_bitrate = 128; //kbit/sec mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES); - - // Here's where we set the size of the network buffer and some buffering - // parameters. In this case we want a network buffer of 16k, we want it - // to prebuffer 40% of that when we first connect, and we want it - // to rebuffer 80% of that whenever we encounter a buffer underrun. - - // Leave the net buffer properties at the default. - //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80); } @@ -256,7 +248,6 @@ void LLStreamingAudio_FMODSTUDIO::stop() mDeadStreams.push_back(mCurrentInternetStreamp); } mCurrentInternetStreamp = NULL; - //mURL.clear(); } }