9 files changed, 119 insertions, 43 deletions

diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index 235248e..70041e7 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llaudio)
 
 include(00-Common)
 include(Audio)
+include(OPENAL)
 include(FMOD)
 include(OPENAL)
 include(LLCommon)
@@ -25,6 +26,7 @@ include_directories(
     ${OPENAL_LIB_INCLUDE_DIRS}
     ${FREEAULT_LIB_INCLUDE_DIRS}
     ${LLMEDIA_INCLUDE_DIRS}
+    ${GSTREAMER_INCLUDE_DIRS}
     )
 
 set(llaudio_SOURCE_FILES
@@ -83,6 +85,7 @@ 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}
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index c5bc367..dd0ffff 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -45,6 +45,8 @@
 #include "llassetstorage.h"
 
 #include "llmediamanager.h"
+#include "llmediabase.h"
+#include "llmediaimplcommon.h"
 
 // necessary for grabbing sounds from sim (implemented in viewer)       
 extern void request_sound(const LLUUID &sound_guid);
@@ -101,6 +103,8 @@ void LLAudioEngine::setDefaults()
 
         mInternetStreamMedia = NULL;
         mInternetStreamURL.clear();
+
+        mStatus = LLMediaBase::STATUS_UNKNOWN;
 }
 
 
@@ -168,6 +172,14 @@ void LLAudioEngine::shutdown()
 }
 
 
+////////////////////////////////////////////////////////////////////////////////
+// virtual (derives from LLMediaBase)
+LLMediaBase::EStatus LLAudioEngine::getStatus()
+{
+        return mStatus;
+}
+
+
 // virtual
 void LLAudioEngine::startInternetStream(const std::string& url)
 {
@@ -184,31 +196,51 @@ void LLAudioEngine::startInternetStream(const std::string& url)
         }
 
         if(!mInternetStreamMedia)
+        {
                 return;
-        
-        if (!url.empty()) {
-                llinfos << "Starting internet stream: " << url << llendl;
-                mInternetStreamURL = url;
-                mInternetStreamMedia->navigateTo ( url );
-                llinfos << "Playing....." << llendl;            
-                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
+        }
+        // Check for a dead stream from gstreamer, just in case
+        else if(getStatus() == LLMediaBase::STATUS_DEAD)
+        {
+                llinfos << "don't play dead stream urls"<< llendl;
+                mInternetStreamURL.clear();
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
-        } else {
-                llinfos << "setting stream to NULL"<< llendl;
+                stopInternetStream();
+        }
+        else if (url.empty())
+        {
+                llinfos << "url is emptly. Setting stream to NULL"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
         }
+        // Stream appears to be good, attempting to play
+        else
+        {
+                // stop any other stream first
+                stopInternetStream();
+
+                llinfos << "Starting internet stream: " << url << llendl;
+                mInternetStreamURL = url;
+                mInternetStreamMedia->navigateTo(url);
+                //llinfos << "Playing....." << llendl;          
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
+                mInternetStreamMedia->updateMedia();
+                mStatus = LLMediaBase::STATUS_STARTED;
+        }
 }
 
 // virtual
 void LLAudioEngine::stopInternetStream()
 {
         llinfos << "entered stopInternetStream()" << llendl;
-        
-        if(mInternetStreamMedia)
+        mInternetStreamURL.clear();
+
+    if(mInternetStreamMedia)
         {
-                if( ! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)){
+                if(!mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP))
+                {
                         llinfos << "attempting to stop stream failed!" << llendl;
                 }
                 mInternetStreamMedia->updateMedia();
@@ -300,6 +332,13 @@ void LLAudioEngine::updateChannels()
         {
                 if (mChannels[i])
                 {
+                        // set secondary gain if type is available
+                        LLAudioSource* source = mChannels[i]->getSource();
+                        if (source)
+                        {
+                                mChannels[i]->setSecondaryGain(mSecondaryGain[source->getType()]);
+                        }
+                        
                         mChannels[i]->updateBuffer();
                         mChannels[i]->update3DPosition();
                         mChannels[i]->updateLoop();
@@ -378,7 +417,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
                 LLAudioChannel *channelp = getFreeChannel(max_priority);
                 if (channelp)
                 {
-                        //llinfos << "Replacing source in channel due to priority!" << llendl;
+                        //LL_INFOS("AudioEngine") << "Replacing source in channel due to priority!" << llendl;
                         max_sourcep->setChannel(channelp);
                         channelp->setSource(max_sourcep);
                         if (max_sourcep->isSyncSlave())
@@ -545,7 +584,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
                 {
                         if (!mBuffers[i]->mInUse && mBuffers[i]->mLastUseTimer.getElapsedTimeF32() > 30.f)
                         {
-                                //llinfos << "Flushing unused buffer!" << llendl;
+                                //LL_INFOS("AudioEngine") << "Flushing unused buffer!" << llendl;
                                 mBuffers[i]->mAudioDatap->mBufferp = NULL;
                                 delete mBuffers[i];
                                 mBuffers[i] = NULL;
@@ -658,8 +697,8 @@ LLAudioBuffer *LLAudioEngine::getFreeBuffer()
 
         if (buffer_id >= 0)
         {
-                llinfos << "Taking over unused buffer " << buffer_id << llendl;
-                //llinfos << "Flushing unused buffer!" << llendl;
+                LL_INFOS("AudioEngine") << "Taking over unused buffer " << buffer_id << llendl;
+                //LL_INFOS("AudioEngine") << "Flushing unused buffer!" << llendl;
                 mBuffers[buffer_id]->mAudioDatap->mBufferp = NULL;
                 delete mBuffers[buffer_id];
                 mBuffers[buffer_id] = createBuffer();
@@ -871,9 +910,10 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
                                                                  const S32 type, const LLVector3d &pos_global)
 {
         // Create a new source (since this can't be associated with an existing source.
-        //llinfos << "Localized: " << audio_uuid << llendl;
+        //LL_INFOS("AudioEngine") << "Localized: " << audio_uuid << llendl;
 
-        if (mMuted)
+        //If we cannot hear it, dont even try to load the sound.
+        if (mMuted || gain == 0.0)
         {
                 return;
         }
@@ -1093,10 +1133,10 @@ bool LLAudioEngine::hasLocalFile(const LLUUID &uuid)
 
 void LLAudioEngine::startNextTransfer()
 {
-        //llinfos << "LLAudioEngine::startNextTransfer()" << llendl;
+        //LL_INFOS("AudioEngine") << "LLAudioEngine::startNextTransfer()" << llendl;
         if (mCurrentTransfer.notNull() || getMuted())
         {
-                //llinfos << "Transfer in progress, aborting" << llendl;
+                //LL_INFOS("AudioEngine") << "Transfer in progress, aborting" << llendl;
                 return;
         }
 
@@ -1277,7 +1317,7 @@ void LLAudioEngine::startNextTransfer()
 
         if (asset_id.notNull())
         {
-                llinfos << "Getting asset data for: " << asset_id << llendl;
+                LL_INFOS("AudioEngine") << "Getting asset data for: " << asset_id << llendl;
                 gAudiop->mCurrentTransfer = asset_id;
                 gAudiop->mCurrentTransferTimer.reset();
                 gAssetStorage->getAssetData(asset_id, LLAssetType::AT_SOUND,
@@ -1285,7 +1325,7 @@ void LLAudioEngine::startNextTransfer()
         }
         else
         {
-                //llinfos << "No pending transfers?" << llendl;
+                //LL_INFOS("AudioEngine") << "No pending transfers?" << llendl;
         }
 }
 
@@ -1295,7 +1335,7 @@ void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::E
 {
         if (result_code)
         {
-                llinfos << "Boom, error in audio file transfer: " << LLAssetStorage::getErrorString( result_code ) << " (" << result_code << ")" << llendl;
+                LL_INFOS("AudioEngine") << "Boom, error in audio file transfer: " << LLAssetStorage::getErrorString( result_code ) << " (" << result_code << ")" << llendl;
                 // Need to mark data as bad to avoid constant rerequests.
                 LLAudioData *adp = gAudiop->getAudioData(uuid);
                 if (adp)
@@ -1676,7 +1716,7 @@ LLAudioChannel::LLAudioChannel() :
 LLAudioChannel::~LLAudioChannel()
 {
         // Need to disconnect any sources which are using this channel.
-        //llinfos << "Cleaning up audio channel" << llendl;
+        //LL_INFOS("AudioEngine") << "Cleaning up audio channel" << llendl;
         if (mCurrentSourcep)
         {
                 mCurrentSourcep->setChannel(NULL);
@@ -1687,12 +1727,12 @@ LLAudioChannel::~LLAudioChannel()
 
 void LLAudioChannel::setSource(LLAudioSource *sourcep)
 {
-        //llinfos << this << ": setSource(" << sourcep << ")" << llendl;
+        //LL_INFOS("AudioEngine") << this << ": setSource(" << sourcep << ")" << llendl;
 
         if (!sourcep)
         {
                 // Clearing the source for this channel, don't need to do anything.
-                //llinfos << "Clearing source for channel" << llendl;
+                //LL_INFOS("AudioEngine") << "Clearing source for channel" << llendl;
                 cleanup();
                 mCurrentSourcep = NULL;
                 mWaiting = false;
@@ -1702,7 +1742,7 @@ void LLAudioChannel::setSource(LLAudioSource *sourcep)
         if (sourcep == mCurrentSourcep)
         {
                 // Don't reallocate the channel, this will make FMOD goofy.
-                //llinfos << "Calling setSource with same source!" << llendl;
+                //LL_INFOS("AudioEngine") << "Calling setSource with same source!" << llendl;
         }
 
         mCurrentSourcep = sourcep;
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index b582f14..d289ba5 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -45,6 +45,8 @@
 #include "llframetimer.h"
 #include "llassettype.h"
 
+#include "llmediabase.h"
+
 class LLMediaBase;
 
 const F32 LL_WIND_UPDATE_INTERVAL = 0.1f;
@@ -160,6 +162,7 @@ public:
         // use a value from 0.0 to 1.0, inclusive
         virtual void setInternetStreamGain(F32 vol);
         virtual const std::string& getInternetStreamURL();
+        virtual LLMediaBase::EStatus getStatus();
 
         // For debugging usage
         virtual LLVector3 getListenerPos();
@@ -246,6 +249,8 @@ protected:
 
         LLFrameTimer mWindUpdateTimer;
 
+        LLMediaBase::EStatus mStatus;
+
 private:
         void setDefaults();
         LLMediaBase *mInternetStreamMedia;
diff --git a/linden/indra/llaudio/audioengine_fmod.h b/linden/indra/llaudio/audioengine_fmod.h
index 4d2cbce..60f75b9 100644
--- a/linden/indra/llaudio/audioengine_fmod.h
+++ b/linden/indra/llaudio/audioengine_fmod.h
@@ -49,7 +49,7 @@ public:
 
         // initialization/startup/shutdown
         virtual bool init(const S32 num_channels, void *user_data);
-        virtual std::string getDriverName(bool verbose);
+        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 b33e0b0..a14b725 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -54,15 +54,41 @@ 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))
         {
-                llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << llendl;
+                llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << errorstring << llendl;
                 return false;
         }
 
diff --git a/linden/indra/llaudio/audioengine_openal.h b/linden/indra/llaudio/audioengine_openal.h
index 54b60e6..5ccdcb7 100644
--- a/linden/indra/llaudio/audioengine_openal.h
+++ b/linden/indra/llaudio/audioengine_openal.h
@@ -39,6 +39,7 @@
 #include "listener_openal.h"
 #include "windgen.h"
 
+
 class LLAudioEngine_OpenAL : public LLAudioEngine
 {
         public:
diff --git a/linden/indra/llaudio/listener_openal.cpp b/linden/indra/llaudio/listener_openal.cpp
index 718de63..a164242 100644
--- a/linden/indra/llaudio/listener_openal.cpp
+++ b/linden/indra/llaudio/listener_openal.cpp
@@ -122,4 +122,3 @@ F32 LLListener_OpenAL::getDistanceFactor()
 {
         return mDistanceFactor;
 }
-
diff --git a/linden/indra/llaudio/listener_openal.h b/linden/indra/llaudio/listener_openal.h
index 3e4353f..6f71a02 100644
--- a/linden/indra/llaudio/listener_openal.h
+++ b/linden/indra/llaudio/listener_openal.h
@@ -35,7 +35,8 @@
 
 #include "listener.h"
 
-#include "AL/al.h"
+
+//#include "AL/al.h"
 #include "AL/alut.h"
 
 class LLListener_OpenAL  : public LLListener
diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index 0515648..c984e1f 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -374,16 +374,16 @@ BOOL LLVorbisDecodeState::finishDecode()
   
                 // write "data" chunk length, in little-endian format
                 S32 data_length = mWAVBuffer.size() - WAV_HEADER_SIZE;
-                mWAVBuffer[40] = (data_length) & 0x000000FF;
-                mWAVBuffer[41] = (data_length >> 8) & 0x000000FF;
-                mWAVBuffer[42] = (data_length >> 16) & 0x000000FF;
-                mWAVBuffer[43] = (data_length >> 24) & 0x000000FF;
+                mWAVBuffer[40] = (data_length - 8) & 0x000000FF;
+                mWAVBuffer[41] = ((data_length - 8)>> 8) & 0x000000FF;
+                mWAVBuffer[42] = ((data_length - 8)>> 16) & 0x000000FF;
+                mWAVBuffer[43] = ((data_length - 8)>> 24) & 0x000000FF;
+
                 // write overall "RIFF" length, in little-endian format
-                data_length += 36;
-                mWAVBuffer[4] = (data_length) & 0x000000FF;
-                mWAVBuffer[5] = (data_length >> 8) & 0x000000FF;
-                mWAVBuffer[6] = (data_length >> 16) & 0x000000FF;
-                mWAVBuffer[7] = (data_length >> 24) & 0x000000FF;
+                mWAVBuffer[4] = (data_length + 28) & 0x000000FF;
+                mWAVBuffer[5] = ((data_length + 28) >> 8) & 0x000000FF;
+                mWAVBuffer[6] = ((data_length + 28) >> 16) & 0x000000FF;
+                mWAVBuffer[7] = ((data_length + 28) >> 24) & 0x000000FF;
 
                 //
                 // FUDGECAKES!!! Vorbis encode/decode messes up loop point transitions (pop)
@@ -395,7 +395,8 @@ BOOL LLVorbisDecodeState::finishDecode()
                         S32 fade_length;
                         char pcmout[4096];              /*Flawfinder: ignore*/  
 
-                        fade_length = llmin((S32)128,(S32)(data_length-36)/8);                  
+                        fade_length = llmin((S32)128,(S32)(data_length)/8);                     
+
                         if((S32)mWAVBuffer.size() >= (WAV_HEADER_SIZE + 2* fade_length))
                         {
                                 memcpy(pcmout, &mWAVBuffer[WAV_HEADER_SIZE], (2 * fade_length));        /*Flawfinder: ignore*/
@@ -435,7 +436,7 @@ BOOL LLVorbisDecodeState::finishDecode()
                         }
                 }
 
-                if (36 == data_length)
+                if (0 == data_length)
                 {
                         llwarns << "BAD Vorbis decode in finishDecode!" << llendl;
                         mValid = FALSE;