diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/llaudio/audioengine_openal.cpp | 2 | ||||
-rw-r--r-- | linden/indra/llaudio/audioengine_openal.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2457125..404b9fd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -9,6 +9,12 @@ | |||
9 | 9 | ||
10 | modified: linden/indra/cmake/CopyWinLibs.cmake | 10 | modified: linden/indra/cmake/CopyWinLibs.cmake |
11 | modified: linden/install.xml | 11 | modified: linden/install.xml |
12 | |||
13 | * Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' : | ||
14 | only static const integral data members can be initialized within a class. | ||
15 | |||
16 | modified: linden/indra/llaudio/audioengine_openal.cpp | ||
17 | modified: linden/indra/llaudio/audioengine_openal.h | ||
12 | 18 | ||
13 | 19 | ||
14 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- | 20 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp index a14b725..5f04d56 100644 --- a/linden/indra/llaudio/audioengine_openal.cpp +++ b/linden/indra/llaudio/audioengine_openal.cpp | |||
@@ -416,7 +416,7 @@ void LLAudioEngine_OpenAL::initWind() | |||
416 | mWindGen = new LLWindGen<WIND_SAMPLE_T>; | 416 | mWindGen = new LLWindGen<WIND_SAMPLE_T>; |
417 | 417 | ||
418 | mWindBufFreq = mWindGen->getInputSamplingRate(); | 418 | mWindBufFreq = mWindGen->getInputSamplingRate(); |
419 | mWindBufSamples = llceil(mWindBufFreq * WIND_BUFFER_SIZE_SEC); | 419 | mWindBufSamples = llceil(mWindBufFreq * 0.05f); // 1/20th sec - WIND_BUFFER_SIZE_SEC |
420 | mWindBufBytes = mWindBufSamples * 2 /*stereo*/ * sizeof(WIND_SAMPLE_T); | 420 | mWindBufBytes = mWindBufSamples * 2 /*stereo*/ * sizeof(WIND_SAMPLE_T); |
421 | 421 | ||
422 | mWindBuf = new WIND_SAMPLE_T [mWindBufSamples * 2 /*stereo*/]; | 422 | mWindBuf = new WIND_SAMPLE_T [mWindBufSamples * 2 /*stereo*/]; |
diff --git a/linden/indra/llaudio/audioengine_openal.h b/linden/indra/llaudio/audioengine_openal.h index 5ccdcb7..c14551c 100644 --- a/linden/indra/llaudio/audioengine_openal.h +++ b/linden/indra/llaudio/audioengine_openal.h | |||
@@ -73,7 +73,6 @@ class LLAudioEngine_OpenAL : public LLAudioEngine | |||
73 | int mNumEmptyWindALBuffers; | 73 | int mNumEmptyWindALBuffers; |
74 | 74 | ||
75 | static const int MAX_NUM_WIND_BUFFERS = 80; | 75 | static const int MAX_NUM_WIND_BUFFERS = 80; |
76 | static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec | ||
77 | }; | 76 | }; |
78 | 77 | ||
79 | class LLAudioChannelOpenAL : public LLAudioChannel | 78 | class LLAudioChannelOpenAL : public LLAudioChannel |