21 files changed, 247 insertions, 140 deletions

diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index 8a26e54..70041e7 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -6,6 +6,7 @@ include(00-Common)
 include(Audio)
 include(OPENAL)
 include(FMOD)
+include(OPENAL)
 include(LLCommon)
 include(LLMath)
 include(LLMessage)
@@ -76,7 +77,6 @@ if (OPENAL)
     audioengine_openal.h
     listener_openal.h
     )
-  
 endif (OPENAL)
 
 set_source_files_properties(${llaudio_HEADER_FILES}
@@ -85,3 +85,11 @@ set_source_files_properties(${llaudio_HEADER_FILES}
 list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
 
 add_library (llaudio ${llaudio_SOURCE_FILES})
+
+target_link_libraries(
+    llaudio
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    )
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 438aefc..dd0ffff 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -98,12 +98,12 @@ void LLAudioEngine::setDefaults()
         mInternetStreamGain = 0.125f;
         mNextWindUpdate = 0.f;
 
-        mInternetStreamMedia = NULL;
-        mInternetStreamURL.clear();
-
         for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
                 mSecondaryGain[i] = 1.0f;
 
+        mInternetStreamMedia = NULL;
+        mInternetStreamURL.clear();
+
         mStatus = LLMediaBase::STATUS_UNKNOWN;
 }
 
@@ -120,7 +120,7 @@ bool LLAudioEngine::init(const S32 num_channels, void* userdata)
         // Initialize the decode manager
         gAudioDecodeMgrp = new LLAudioDecodeMgr;
 
-        LL_INFOS("AudioEngine") << "LLAudioEngine::init() AudioEngine successfully initialized" << llendl;
+        llinfos << "LLAudioEngine::init() AudioEngine successfully initialized" << llendl;
 
         return true;
 }
@@ -183,7 +183,7 @@ LLMediaBase::EStatus LLAudioEngine::getStatus()
 // virtual
 void LLAudioEngine::startInternetStream(const std::string& url)
 {
-        LL_INFOS("AudioEngine") << "entered startInternetStream()" << llendl;
+        llinfos << "entered startInternetStream()" << llendl;
 
         if (!mInternetStreamMedia)
         {
@@ -191,7 +191,7 @@ void LLAudioEngine::startInternetStream(const std::string& url)
                 if (mgr)
                 {
                         mInternetStreamMedia = mgr->createSourceFromMimeType(LLURI(url).scheme(), "audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
-                        LL_INFOS("AudioEngine") << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
+                        llinfos << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
                 }
         }
 
@@ -202,7 +202,7 @@ void LLAudioEngine::startInternetStream(const std::string& url)
         // Check for a dead stream from gstreamer, just in case
         else if(getStatus() == LLMediaBase::STATUS_DEAD)
         {
-                LL_INFOS("AudioEngine") << "don't play dead stream urls"<< llendl;
+                llinfos << "don't play dead stream urls"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
@@ -210,7 +210,7 @@ void LLAudioEngine::startInternetStream(const std::string& url)
         }
         else if (url.empty())
         {
-                LL_INFOS("AudioEngine") << "url is emptly. Setting stream to NULL"<< llendl;
+                llinfos << "url is emptly. Setting stream to NULL"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
@@ -221,10 +221,10 @@ void LLAudioEngine::startInternetStream(const std::string& url)
                 // stop any other stream first
                 stopInternetStream();
 
-                LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl;
+                llinfos << "Starting internet stream: " << url << llendl;
                 mInternetStreamURL = url;
                 mInternetStreamMedia->navigateTo(url);
-                //LL_INFOS("AudioEngine") << "Playing....." << llendl;          
+                //llinfos << "Playing....." << llendl;          
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
                 mInternetStreamMedia->updateMedia();
                 mStatus = LLMediaBase::STATUS_STARTED;
@@ -234,17 +234,42 @@ void LLAudioEngine::startInternetStream(const std::string& url)
 // virtual
 void LLAudioEngine::stopInternetStream()
 {
-        LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl;
+        llinfos << "entered stopInternetStream()" << llendl;
         mInternetStreamURL.clear();
 
     if(mInternetStreamMedia)
         {
                 if(!mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP))
                 {
-                        LL_INFOS("AudioEngine") << "attempting to stop stream failed!" << llendl;
+                        llinfos << "attempting to stop stream failed!" << llendl;
                 }
                 mInternetStreamMedia->updateMedia();
         }
+
+        mInternetStreamURL.clear();
+}
+
+// virtual
+void LLAudioEngine::pauseInternetStream(int pause)
+{
+        llinfos << "entered pauseInternetStream()" << llendl;
+
+        if(!mInternetStreamMedia)
+                return;
+        
+        if(pause)
+        {
+                if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_PAUSE))
+                {
+                        llinfos << "attempting to pause stream failed!" << llendl;
+                }
+        } else {
+                if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START))
+                {
+                        llinfos << "attempting to unpause stream failed!" << llendl;
+                }
+        }
+        mInternetStreamMedia->updateMedia();
 }
 
 // virtual
@@ -265,6 +290,11 @@ int LLAudioEngine::isInternetStreamPlaying()
                 return 1; // Active and playing
         }       
 
+        if (mInternetStreamMedia->getStatus() == LLMediaBase::STATUS_PAUSED)
+        {
+                return 2; // paused
+        }
+
         return 0; // Stopped
 }
 
@@ -1526,7 +1556,7 @@ bool LLAudioSource::isDone()
                 {
                         // We don't have a channel assigned, and it's been
                         // over 5 seconds since we tried to play it.  Don't bother.
-                        //LL_INFOS("AudioEngine") << "No channel assigned, source is done" << llendl;
+                        //llinfos << "No channel assigned, source is done" << llendl;
                         return true;
                 }
                 else
@@ -1716,6 +1746,8 @@ void LLAudioChannel::setSource(LLAudioSource *sourcep)
         }
 
         mCurrentSourcep = sourcep;
+
+
         updateBuffer();
         update3DPosition();
 }
@@ -1730,6 +1762,12 @@ bool LLAudioChannel::updateBuffer()
                 return false;
         }
 
+        // Initialize the channel's gain setting for this sound.
+        if(gAudiop)
+        {
+                setSecondaryGain(gAudiop->getSecondaryGain(mCurrentSourcep->getType()));
+        }
+
         LLAudioBuffer *bufferp = mCurrentSourcep->getCurrentBuffer();
         if (bufferp == mCurrentBufferp)
         {
@@ -1804,7 +1842,7 @@ bool LLAudioData::load()
         if (mBufferp)
         {
                 // We already have this sound in a buffer, don't do anything.
-                LL_INFOS("AudioEngine") << "Already have a buffer for this sound, don't bother loading!" << llendl;
+                llinfos << "Already have a buffer for this sound, don't bother loading!" << llendl;
                 return true;
         }
         
@@ -1812,7 +1850,7 @@ bool LLAudioData::load()
         if (!mBufferp)
         {
                 // No free buffers, abort.
-                LL_INFOS("AudioEngine") << "Not able to allocate a new audio buffer, aborting." << llendl;
+                llinfos << "Not able to allocate a new audio buffer, aborting." << llendl;
                 return false;
         }
 
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 878a96a..d289ba5 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -155,6 +155,7 @@ public:
         // Internet stream methods
         virtual void startInternetStream(const std::string& url);
         virtual void stopInternetStream();
+        virtual void pauseInternetStream(int pause);
         virtual void updateInternetStream();
         virtual int isInternetStreamPlaying();
         virtual void getInternetStreamInfo(char* artist, char* title);
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 354ef95..2197a45 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -155,7 +155,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
         bool audio_ok = false;
 
         if (!audio_ok)
-                if (NULL == getenv("LL_BAD_ESD")) /*Flawfinder: ignore*/
+                if (NULL == getenv("LL_BAD_FMOD_ESD")) /*Flawfinder: ignore*/
                 {
                         LL_DEBUGS("AppInit") << "Trying ESD audio output..." << LL_ENDL;
                         if(FSOUND_SetOutput(FSOUND_OUTPUT_ESD) &&
@@ -173,7 +173,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
                 }
 
         if (!audio_ok)
-                if (NULL == getenv("LL_BAD_OSS"))        /*Flawfinder: ignore*/
+                if (NULL == getenv("LL_BAD_FMOD_OSS"))   /*Flawfinder: ignore*/
                 {
                         LL_DEBUGS("AppInit") << "Trying OSS audio output..."    << LL_ENDL;
                         if(FSOUND_SetOutput(FSOUND_OUTPUT_OSS) &&
@@ -190,7 +190,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
                 }
 
         if (!audio_ok)
-                if (NULL == getenv("LL_BAD_ALSA"))              /*Flawfinder: ignore*/
+                if (NULL == getenv("LL_BAD_FMOD_ALSA"))         /*Flawfinder: ignore*/
                 {
                         LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL;
                         if(FSOUND_SetOutput(FSOUND_OUTPUT_ALSA) &&
@@ -250,6 +250,20 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 }
 
 
+std::string LLAudioEngine_FMOD::getDriverName(bool verbose)
+{
+        if (verbose)
+        {
+                F32 version = FSOUND_GetVersion();
+                return llformat("FMOD version %f", version);
+        }
+        else
+        {
+                return "FMOD";
+        }
+}
+
+
 void LLAudioEngine_FMOD::allocateListener(void)
 {       
         mListenerp = (LLListener *) new LLListener_FMOD();
@@ -470,7 +484,7 @@ bool LLAudioChannelFMOD::updateBuffer()
         if (mCurrentSourcep)
         {
                 // SJB: warnings can spam and hurt framerate, disabling
-                if (!FSOUND_SetVolume(mChannelID, llround(mCurrentSourcep->getGain() * 255.0f)))
+                if (!FSOUND_SetVolume(mChannelID, llround(getSecondaryGain() * mCurrentSourcep->getGain() * 255.0f)))
                 {
 //                      llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
                 }
@@ -532,8 +546,9 @@ void LLAudioChannelFMOD::updateLoop()
         }
 
         //
-        // Hack:  We keep track of whether we looped or not by seeing when the sign of the last sample
-        // flips.  This is pretty crappy.
+        // Hack:  We keep track of whether we looped or not by seeing when the
+        // sample position looks like it's going backwards.  Not reliable; may
+        // yield false negatives.
         //
         U32 cur_pos = FSOUND_GetCurrentPosition(mChannelID);
         if (cur_pos < (U32)mLastSamplePos)
diff --git a/linden/indra/llaudio/audioengine_fmod.h b/linden/indra/llaudio/audioengine_fmod.h
index 132afb1..60f75b9 100644
--- a/linden/indra/llaudio/audioengine_fmod.h
+++ b/linden/indra/llaudio/audioengine_fmod.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -49,6 +49,7 @@ public:
 
         // initialization/startup/shutdown
         virtual bool init(const S32 num_channels, void *user_data);
+        virtual std::string getDriverName(bool verbose);
         virtual void allocateListener();
 
         virtual void shutdown();
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index 6d9a242..5f04d56 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -36,6 +36,7 @@
 #include "audioengine_openal.h"
 #include "listener_openal.h"
 
+
 LLAudioEngine_OpenAL::LLAudioEngine_OpenAL()
         :
         mWindGen(NULL),
@@ -53,41 +54,67 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL()
 {
 }
 
+static ALboolean alutInitHelp(const char **errorstring)
+{
+        ALboolean result = AL_FALSE;
+        ALenum err = AL_NO_ERROR;
+#if LL_WINDOWS
+        __try {
+                result = alutInit(NULL, NULL);
+                err = alutGetError();
+                alGetError(); // hit loading of wrap_oal.dll
+                if(!result) *errorstring = alutGetErrorString(err);
+        } __except( EXCEPTION_EXECUTE_HANDLER ) {
+                *errorstring = "[Exception]";
+                result = AL_FALSE;
+        }
+        return result;
+#else
+        result = alutInit(NULL, NULL);
+        if(!result) {
+                err = alutGetError();
+                *errorstring = alutGetErrorString(err);
+        }
+        return result;
+#endif
+}
+
 // virtual
 bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata)
 {
+        const char *errorstring = "(null)";
         mWindGen = NULL;
         LLAudioEngine::init(num_channels, userdata);
 
-        if(!alutInit(NULL, NULL))
+        if(!alutInitHelp(&errorstring))
         {
-                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << LL_ENDL;
+                llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << errorstring << llendl;
                 return false;
         }
 
-        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << LL_ENDL;
+        llinfos << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << llendl;
 
-        LL_INFOS("OpenAL") << "OpenAL version: "
-                << ll_safe_string(alGetString(AL_VERSION)) << LL_ENDL;
-        LL_INFOS("OpenAL") << "OpenAL vendor: "
-                << ll_safe_string(alGetString(AL_VENDOR)) << LL_ENDL;
-        LL_INFOS("OpenAL") << "OpenAL renderer: "
-                << ll_safe_string(alGetString(AL_RENDERER)) << LL_ENDL;
+        llinfos << "OpenAL version: "
+                << ll_safe_string(alGetString(AL_VERSION)) << llendl;
+        llinfos << "OpenAL vendor: "
+                << ll_safe_string(alGetString(AL_VENDOR)) << llendl;
+        llinfos << "OpenAL renderer: "
+                << ll_safe_string(alGetString(AL_RENDERER)) << llendl;
 
         ALint major = alutGetMajorVersion ();
         ALint minor = alutGetMinorVersion ();
-        LL_INFOS("OpenAL") << "ALUT version: " << major << "." << minor << LL_ENDL;
+        llinfos << "ALUT version: " << major << "." << minor << llendl;
 
         ALCdevice *device = alcGetContextsDevice(alcGetCurrentContext());
 
         alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &major);
         alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &minor);
-        LL_INFOS("OpenAL") << "ALC version: " << major << "." << minor << LL_ENDL;
+        llinfos << "ALC version: " << major << "." << minor << llendl;
 
-        LL_INFOS("OpenAL") << "ALC default device: "
+        llinfos << "ALC default device: "
                 << ll_safe_string(alcGetString(device,
                                                ALC_DEFAULT_DEVICE_SPECIFIER))
-                << LL_ENDL;
+                << llendl;
 
         return true;
 }
@@ -127,24 +154,24 @@ void LLAudioEngine_OpenAL::allocateListener()
         mListenerp = (LLListener *) new LLListener_OpenAL();
         if(!mListenerp)
         {
-                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << LL_ENDL;
+                llwarns << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << llendl;
         }
 }
 
 // virtual
 void LLAudioEngine_OpenAL::shutdown()
 {
-        LL_INFOS("OpenAL") << "About to LLAudioEngine::shutdown()" << LL_ENDL;
+        llinfos << "About to LLAudioEngine::shutdown()" << llendl;
         LLAudioEngine::shutdown();
 
-        LL_INFOS("OpenAL") << "About to alutExit()" << LL_ENDL;
+        llinfos << "About to alutExit()" << llendl;
         if(!alutExit())
         {
-                LL_WARNS("OpenAL") << "Nuts." << LL_ENDL;
-                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << LL_ENDL;
+                llwarns << "Nuts." << llendl;
+                llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << llendl;
         }
 
-        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << LL_ENDL;
+        llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
 
         delete mListenerp;
         mListenerp = NULL;
@@ -162,7 +189,7 @@ LLAudioChannel *LLAudioEngine_OpenAL::createChannel()
 
 void LLAudioEngine_OpenAL::setInternalGain(F32 gain)
 {
-        //LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::setInternalGain() Gain: " << gain << LL_ENDL;
+        //llinfos << "LLAudioEngine_OpenAL::setInternalGain() Gain: " << gain << llendl;
         alListenerf(AL_GAIN, gain);
 }
 
@@ -172,17 +199,6 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL()
         mLastSamplePos(0)
 {
         alGenSources(1, &mALSource);
-
-        if( mALSource == AL_NONE )
-        {
-                ALenum error = alGetError();
-                if( error == AL_NO_ERROR )
-                {
-                        LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource, but no error is indicated!" << LL_ENDL;
-                }
-                LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource: (" << error << ") " << alGetString( error ) << LL_ENDL;
-        }
-
 }
 
 LLAudioChannelOpenAL::~LLAudioChannelOpenAL()
@@ -201,7 +217,7 @@ void LLAudioChannelOpenAL::play()
 {
         if (mALSource == AL_NONE)
         {
-                LL_WARNS("OpenAL") << "Playing without a mALSource, aborting" << LL_ENDL;
+                llwarns << "Playing without a mALSource, aborting" << llendl;
                 return;
         }
 
@@ -226,8 +242,8 @@ void LLAudioChannelOpenAL::playSynced(LLAudioChannel *channelp)
                         alGetSourcef(masterchannelp->mALSource, AL_SEC_OFFSET,
                                      &master_offset);
 
-                        LL_INFOS("OpenAL") << "Syncing with master at " << master_offset
-                                << "sec" << LL_ENDL;
+                        llinfos << "Syncing with master at " << master_offset
+                                << "sec" << llendl;
                         // *TODO: detect when this fails, maybe use AL_SAMPLE_
                         alSourcef(mALSource, AL_SEC_OFFSET, master_offset);
                 }
@@ -309,14 +325,12 @@ void LLAudioChannelOpenAL::update3DPosition()
         {
                 alSource3f(mALSource, AL_POSITION, 0.0, 0.0, 0.0);
                 alSource3f(mALSource, AL_VELOCITY, 0.0, 0.0, 0.0);
-                //alSource3f(mALSource, AL_DIRECTION, 0.0, 0.0, 0.0);
                 alSourcei (mALSource, AL_SOURCE_RELATIVE, AL_TRUE);
         } else {
                 LLVector3 float_pos;
                 float_pos.setVec(mCurrentSourcep->getPositionGlobal());
                 alSourcefv(mALSource, AL_POSITION, float_pos.mV);
                 alSourcefv(mALSource, AL_VELOCITY, mCurrentSourcep->getVelocity().mV);
-                //alSource3f(mALSource, AL_DIRECTION, 0.0, 0.0, 0.0);
                 alSourcei (mALSource, AL_SOURCE_RELATIVE, AL_FALSE);
         }
 
@@ -351,18 +365,18 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
                 ALenum error = alutGetError(); 
                 if (gDirUtilp->fileExists(filename))
                 {
-                        LL_WARNS("OpenAL") <<
+                        llwarns <<
                                 "LLAudioBufferOpenAL::loadWAV() Error loading "
                                 << filename
-                                << " " << alutGetErrorString(error) << LL_ENDL;
+                                << " " << alutGetErrorString(error) << llendl;
                 }
                 else
                 {
                         // It's common for the file to not actually exist.
-                        //LL_DEBUGS("OpenAL") <<
-                        //      "LLAudioBufferOpenAL::loadWAV() Error loading "
-                        //       << filename
-                        //       << " " << alutGetErrorString(error) << LL_ENDL;
+                        lldebugs <<
+                                "LLAudioBufferOpenAL::loadWAV() Error loading "
+                                 << filename
+                                 << " " << alutGetErrorString(error) << llendl;
                 }
                 return false;
         }
@@ -378,7 +392,7 @@ U32 LLAudioBufferOpenAL::getLength()
         }
         ALint length;
         alGetBufferi(mALBuffer, AL_SIZE, &length);
-        return length >> 2;
+        return length / 2; // convert size in bytes to size in (16-bit) samples
 }
 
 // ------------
@@ -386,7 +400,7 @@ U32 LLAudioBufferOpenAL::getLength()
 void LLAudioEngine_OpenAL::initWind()
 {
         ALenum error;
-        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::initWind() start" << LL_ENDL;
+        llinfos << "LLAudioEngine_OpenAL::initWind() start" << llendl;
 
         mNumEmptyWindALBuffers = MAX_NUM_WIND_BUFFERS;
 
@@ -396,36 +410,35 @@ void LLAudioEngine_OpenAL::initWind()
         
         if((error=alGetError()) != AL_NO_ERROR)
         {
-                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<LL_ENDL;
+                llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<llendl;
         }
 
         mWindGen = new LLWindGen<WIND_SAMPLE_T>;
-        const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
 
         mWindBufFreq = mWindGen->getInputSamplingRate();
-        mWindBufSamples = llceil(mWindBufFreq * WIND_BUFFER_SIZE_SEC);
+        mWindBufSamples = llceil(mWindBufFreq * 0.05f); // 1/20th sec - WIND_BUFFER_SIZE_SEC
         mWindBufBytes = mWindBufSamples * 2 /*stereo*/ * sizeof(WIND_SAMPLE_T);
 
         mWindBuf = new WIND_SAMPLE_T [mWindBufSamples * 2 /*stereo*/];
 
         if(mWindBuf==NULL)
         {
-                LL_ERRS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << LL_ENDL;
+                llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl;
                 mEnableWind=false;
         }
 
-        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::initWind() done" << LL_ENDL;
+        llinfos << "LLAudioEngine_OpenAL::initWind() done" << llendl;
 }
 
 void LLAudioEngine_OpenAL::cleanupWind()
 {
-        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::cleanupWind()" << LL_ENDL;
+        llinfos << "LLAudioEngine_OpenAL::cleanupWind()" << llendl;
 
         if (mWindSource != AL_NONE)
         {
                 // detach and delete all outstanding buffers on the wind source
                 alSourceStop(mWindSource);
-                int processed;
+                ALint processed;
                 alGetSourcei(mWindSource, AL_BUFFERS_PROCESSED, &processed);
                 while (processed--)
                 {
@@ -485,7 +498,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 
         // ok lets make a wind buffer now
 
-        int processed, queued, unprocessed;
+        ALint processed, queued, unprocessed;
         alGetSourcei(mWindSource, AL_BUFFERS_PROCESSED, &processed);
         alGetSourcei(mWindSource, AL_BUFFERS_QUEUED, &queued);
         unprocessed = queued - processed;
@@ -495,18 +508,18 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
         mNumEmptyWindALBuffers = llmin(mNumEmptyWindALBuffers + processed * 3 - unprocessed, MAX_NUM_WIND_BUFFERS-unprocessed);
         mNumEmptyWindALBuffers = llmax(mNumEmptyWindALBuffers, 0);
 
-        //LL_INFOS("OpenAL") << "mNumEmptyWindALBuffers: " << mNumEmptyWindALBuffers    <<" (" << unprocessed << ":" << processed << ")" << LL_ENDL;
+        //llinfos << "mNumEmptyWindALBuffers: " << mNumEmptyWindALBuffers       <<" (" << unprocessed << ":" << processed << ")" << llendl;
 
         while(processed--) // unqueue old buffers
         {
                 ALuint buffer;
-                int error;
+                ALenum error;
                 alGetError(); /* clear error */
                 alSourceUnqueueBuffers(mWindSource, 1, &buffer);
                 error = alGetError();
                 if(error != AL_NO_ERROR)
                 {
-                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (unqueuing) buffers" << LL_ENDL;
+                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (unqueuing) buffers" << llendl;
                 }
                 else
                 {
@@ -522,7 +535,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
                 alGenBuffers(1,&buffer);
                 if((error=alGetError()) != AL_NO_ERROR)
                 {
-                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << LL_ENDL;
+                        llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << llendl;
                         break;
                 }
 
@@ -534,22 +547,27 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
                              mWindBufFreq);
                 error = alGetError();
                 if(error != AL_NO_ERROR)
-                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (bufferdata) buffers" << LL_ENDL;
+                {
+                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (bufferdata) buffers" << llendl;
+                }
                 
                 alSourceQueueBuffers(mWindSource, 1, &buffer);
                 error = alGetError();
                 if(error != AL_NO_ERROR)
-                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (queuing) buffers" << LL_ENDL;
+                {
+                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (queuing) buffers" << llendl;
+                }
 
                 --mNumEmptyWindALBuffers;
         }
 
-        int playing;
+        ALint playing;
         alGetSourcei(mWindSource, AL_SOURCE_STATE, &playing);
         if(playing != AL_PLAYING)
         {
                 alSourcePlay(mWindSource);
 
-                LL_INFOS("OpenAL") << "Wind had stopped - probably ran out of buffers - restarting: " << (unprocessed+mNumEmptyWindALBuffers) << " now queued." << LL_ENDL;
+                lldebugs << "Wind had stopped - probably ran out of buffers - restarting: " << (unprocessed+mNumEmptyWindALBuffers) << " now queued." << llendl;
         }
 }
+
diff --git a/linden/indra/llaudio/audioengine_openal.h b/linden/indra/llaudio/audioengine_openal.h
index 1f6dee4..c14551c 100644
--- a/linden/indra/llaudio/audioengine_openal.h
+++ b/linden/indra/llaudio/audioengine_openal.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -39,6 +39,7 @@
 #include "listener_openal.h"
 #include "windgen.h"
 
+
 class LLAudioEngine_OpenAL : public LLAudioEngine
 {
         public:
diff --git a/linden/indra/llaudio/listener.cpp b/linden/indra/llaudio/listener.cpp
index ff3cfff..9b99c5f 100644
--- a/linden/indra/llaudio/listener.cpp
+++ b/linden/indra/llaudio/listener.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/listener.h b/linden/indra/llaudio/listener.h
index 595373d..1c15e29 100644
--- a/linden/indra/llaudio/listener.h
+++ b/linden/indra/llaudio/listener.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/listener_ds3d.h b/linden/indra/llaudio/listener_ds3d.h
index 33367a5..e58f3ff 100644
--- a/linden/indra/llaudio/listener_ds3d.h
+++ b/linden/indra/llaudio/listener_ds3d.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/listener_fmod.cpp b/linden/indra/llaudio/listener_fmod.cpp
index 9e48408..eca3547 100644
--- a/linden/indra/llaudio/listener_fmod.cpp
+++ b/linden/indra/llaudio/listener_fmod.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/listener_fmod.h b/linden/indra/llaudio/listener_fmod.h
index 95b31ac..6ac8f20 100644
--- a/linden/indra/llaudio/listener_fmod.h
+++ b/linden/indra/llaudio/listener_fmod.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/listener_openal.cpp b/linden/indra/llaudio/listener_openal.cpp
index 637af30..a164242 100644
--- a/linden/indra/llaudio/listener_openal.cpp
+++ b/linden/indra/llaudio/listener_openal.cpp
@@ -4,26 +4,26 @@
  * support as a OpenAL 3D implementation
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
- *
- * Copyright (c) 2002-2007, Linden Research, Inc.
- *
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- *
+ * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -35,33 +35,40 @@
 
 #include "listener_openal.h"
 
-LLListener_OpenAL::LLListener_OpenAL(){
+LLListener_OpenAL::LLListener_OpenAL()
+{
         init();
 }
 
-LLListener_OpenAL::~LLListener_OpenAL(){
+LLListener_OpenAL::~LLListener_OpenAL()
+{
 }
 
-void LLListener_OpenAL::translate(LLVector3 offset){
+void LLListener_OpenAL::translate(LLVector3 offset)
+{
+        //llinfos << "LLListener_OpenAL::translate() : " << offset << llendl;
         LLListener::translate(offset);
-        llinfos << "LLListener_OpenAL::translate() : " << offset << llendl;
 }
 
-void LLListener_OpenAL::setPosition(LLVector3 pos){
-        LLListener::setPosition(pos);
+void LLListener_OpenAL::setPosition(LLVector3 pos)
+{
         //llinfos << "LLListener_OpenAL::setPosition() : " << pos << llendl;
+        LLListener::setPosition(pos);
 }
 
-void LLListener_OpenAL::setVelocity(LLVector3 vel){
+void LLListener_OpenAL::setVelocity(LLVector3 vel)
+{
         LLListener::setVelocity(vel);
 }
 
-void LLListener_OpenAL::orient(LLVector3 up, LLVector3 at){
-        LLListener::orient(up, at);
+void LLListener_OpenAL::orient(LLVector3 up, LLVector3 at)
+{
         //llinfos << "LLListener_OpenAL::orient() up: " << up << " at: " << at << llendl;
+        LLListener::orient(up, at);
 }
 
-void LLListener_OpenAL::commitDeferredChanges(){
+void LLListener_OpenAL::commitDeferredChanges()
+{
         ALfloat orientation[6];
         orientation[0] = mListenAt.mV[0];
         orientation[1] = mListenAt.mV[1];
@@ -80,19 +87,38 @@ void LLListener_OpenAL::commitDeferredChanges(){
         alListenerfv(AL_VELOCITY, velocity);
 }
 
-void LLListener_OpenAL::setDopplerFactor(F32 factor){
-        // Effect is way too strong by default, scale it down here.
-        // Scaling the speed of sound up causes crashes.
-        factor *= 0.005f;
+void LLListener_OpenAL::setDopplerFactor(F32 factor)
+{
         //llinfos << "LLListener_OpenAL::setDopplerFactor() : " << factor << llendl;
         alDopplerFactor(factor);
 }
 
-F32 LLListener_OpenAL::getDopplerFactor(){
+F32 LLListener_OpenAL::getDopplerFactor()
+{
         ALfloat factor;
-        factor = 0.0f;
-        alDopplerFactor(factor);
-        llinfos << "LLListener_OpenAL::getDopplerFactor() : " << factor << llendl;
+        factor = alGetFloat(AL_DOPPLER_FACTOR);
+        //llinfos << "LLListener_OpenAL::getDopplerFactor() : " << factor << llendl;
         return factor;
 }
 
+
+void LLListener_OpenAL::setRolloffFactor(F32 factor)
+{
+        mRolloffFactor = factor;
+}
+
+F32 LLListener_OpenAL::getRolloffFactor()
+{
+        return mRolloffFactor;
+}
+
+
+void LLListener_OpenAL::setDistanceFactor(F32 factor)
+{
+        mDistanceFactor = factor;
+}
+
+F32 LLListener_OpenAL::getDistanceFactor()
+{
+        return mDistanceFactor;
+}
diff --git a/linden/indra/llaudio/listener_openal.h b/linden/indra/llaudio/listener_openal.h
index 7551161..6f71a02 100644
--- a/linden/indra/llaudio/listener_openal.h
+++ b/linden/indra/llaudio/listener_openal.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -41,12 +41,6 @@
 
 class LLListener_OpenAL  : public LLListener
 {
- private:
- protected:
- public:
-
- private:
- protected:
  public:  
         LLListener_OpenAL();
         virtual ~LLListener_OpenAL();
@@ -59,6 +53,14 @@ class LLListener_OpenAL  : public LLListener
 
         virtual void setDopplerFactor(F32 factor);
         virtual F32 getDopplerFactor();
+        virtual void setDistanceFactor(F32 factor);
+        virtual F32 getDistanceFactor();
+        virtual void setRolloffFactor(F32 factor);
+        virtual F32 getRolloffFactor();
+
+ protected:
+        F32 mDistanceFactor;
+        F32 mRolloffFactor;
 };
 
 #endif
diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index cfd0500..c984e1f 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/llaudiodecodemgr.h b/linden/indra/llaudio/llaudiodecodemgr.h
index ccd5ded..fa6dbd8 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.h
+++ b/linden/indra/llaudio/llaudiodecodemgr.h
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/vorbisdecode.cpp b/linden/indra/llaudio/vorbisdecode.cpp
index 23e02aa..85c4b16 100644
--- a/linden/indra/llaudio/vorbisdecode.cpp
+++ b/linden/indra/llaudio/vorbisdecode.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/vorbisdecode.h b/linden/indra/llaudio/vorbisdecode.h
index a9e1cfb..e130c85 100644
--- a/linden/indra/llaudio/vorbisdecode.h
+++ b/linden/indra/llaudio/vorbisdecode.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/vorbisencode.cpp b/linden/indra/llaudio/vorbisencode.cpp
index 3a107b9..c5a751e 100644
--- a/linden/indra/llaudio/vorbisencode.cpp
+++ b/linden/indra/llaudio/vorbisencode.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/vorbisencode.h b/linden/indra/llaudio/vorbisencode.h
index 6ad0819..eadfa7d 100644
--- a/linden/indra/llaudio/vorbisencode.h
+++ b/linden/indra/llaudio/vorbisencode.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llaudio/windgen.h b/linden/indra/llaudio/windgen.h
index 39ce568..faffd3c 100644
--- a/linden/indra/llaudio/windgen.h
+++ b/linden/indra/llaudio/windgen.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -82,7 +82,7 @@ public:
                         // start with white noise
                         nextSample = ll_frand(2.0f) - 1.0f;
                         
-#if 1 // LLAE_WIND_PINK apply pinking filter
+                        // apply pinking filter
                         mbuf0 = 0.997f * mbuf0 + 0.0126502f * nextSample; 
                         mbuf1 = 0.985f * mbuf1 + 0.0139083f * nextSample;
                         mbuf2 = 0.950f * mbuf2 + 0.0205439f * nextSample;
@@ -91,14 +91,11 @@ public:
                         mbuf5 = 0.250f * mbuf5 + 0.1093477f * nextSample;
                         
                         nextSample = mbuf0 + mbuf1 + mbuf2 + mbuf3 + mbuf4 + mbuf5;
-#endif
                         
-#if 1 //LLAE_WIND_RESONANT // do a resonant filter on the noise
+                        // do a resonant filter on the noise
                         nextSample = (double)( a0 * nextSample - b1 * mY0 - b2 * mY1 );
-                        
                         mY1 = mY0;
                         mY0 = nextSample;
-#endif
                         
                         nextSample *= mCurrentGain;