diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-09 19:08:16 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-09 19:08:16 +0300 |
| commit | 4f34d63f3e9b2d70bd24c2f49cce98da30df050e (patch) | |
| tree | e34b76fc7ad3ac87a791fba44a0778fd3b2c8342 /indra/llaudio/llaudioengine_openal.cpp | |
| parent | d807db70e02c5e0d7232a1ccf134456f619c94ba (diff) | |
| parent | 4976323af8fae67a06e856bc9801635da5bfd79f (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index a5982ccbd6..887c791790 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -370,7 +370,7 @@ U32 LLAudioBufferOpenAL::getLength() // ------------ -void LLAudioEngine_OpenAL::initWind() +bool LLAudioEngine_OpenAL::initWind() { ALenum error; llinfos << "LLAudioEngine_OpenAL::initWind() start" << llendl; @@ -397,10 +397,12 @@ void LLAudioEngine_OpenAL::initWind() if(mWindBuf==NULL) { llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl; - mEnableWind=false; + return false; } llinfos << "LLAudioEngine_OpenAL::initWind() done" << llendl; + + return true; } void LLAudioEngine_OpenAL::cleanupWind() @@ -508,14 +510,14 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude) alGenBuffers(1,&buffer); if((error=alGetError()) != AL_NO_ERROR) { - llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << llendl; + llwarns << "LLAudioEngine_OpenAL::updateWind() Error creating wind buffer: " << error << llendl; break; } alBufferData(buffer, AL_FORMAT_STEREO16, mWindGen->windGenerate(mWindBuf, - mWindBufSamples, 2), + mWindBufSamples), mWindBufBytes, mWindBufFreq); error = alGetError(); |