1 files changed, 67 insertions, 27 deletions

diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index d8082aa..5f1c060 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -46,6 +46,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);
@@ -100,6 +102,8 @@ void LLAudioEngine::setDefaults()
         mInternetStreamMedia = NULL;
         mInternetStreamURL.clear();
 
+        mStatus = LLMediaBase::STATUS_UNKNOWN;
+
         for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
                 mSecondaryGain[i] = 1.0f;
 }
@@ -169,6 +173,14 @@ void LLAudioEngine::shutdown()
 }
 
 
+////////////////////////////////////////////////////////////////////////////////
+// virtual (derives from LLMediaBase)
+LLMediaBase::EStatus LLAudioEngine::getStatus()
+{
+        return mStatus;
+}
+
+
 // virtual
 void LLAudioEngine::startInternetStream(const std::string& url)
 {
@@ -185,31 +197,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();
@@ -301,6 +333,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();
@@ -379,7 +418,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())
@@ -546,7 +585,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;
@@ -659,8 +698,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();
@@ -872,9 +911,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;
         }
@@ -1094,10 +1134,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;
         }
 
@@ -1278,7 +1318,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,
@@ -1286,7 +1326,7 @@ void LLAudioEngine::startNextTransfer()
         }
         else
         {
-                //llinfos << "No pending transfers?" << llendl;
+                //LL_INFOS("AudioEngine") << "No pending transfers?" << llendl;
         }
 }
 
@@ -1296,7 +1336,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)
@@ -1679,7 +1719,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);
@@ -1690,12 +1730,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;
@@ -1705,7 +1745,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;