Updated audio engine to LL's openal branch r1532.

1 files changed, 158 insertions, 26 deletions

diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 5fb38c0..239981b 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -51,9 +51,6 @@ extern void request_sound(const LLUUID &sound_guid);
 
 LLAudioEngine* gAudiop = NULL;
 
-// Maximum amount of time we wait for a transfer to complete before starting
-// off another one.
-const F32 MAX_CURRENT_TRANSFER_TIME = 60.f;
 
 //
 // LLAudioEngine implementation
@@ -77,7 +74,8 @@ void LLAudioEngine::setDefaults()
 
         mListenerp = NULL;
 
-        mMuted = FALSE;
+        mMuted = false;
+        mUserData = NULL;
 
         mLastStatus = 0;
 
@@ -98,16 +96,20 @@ 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;
 }
 
 
-BOOL LLAudioEngine::init(const S32 num_channels)
+bool LLAudioEngine::init(const S32 num_channels, void* userdata)
 {
         setDefaults();
 
         mNumChannels = num_channels;
+        mUserData = userdata;
         
         allocateListener();
 
@@ -126,6 +128,9 @@ void LLAudioEngine::shutdown()
         delete gAudioDecodeMgrp;
         gAudioDecodeMgrp = NULL;
 
+        // Clean up wind source
+        cleanupWind();
+
         // Clean up audio sources
         source_map::iterator iter_src;
         for (iter_src = mAllSources.begin(); iter_src != mAllSources.end(); iter_src++)
@@ -146,22 +151,146 @@ void LLAudioEngine::shutdown()
         S32 i;
         for (i = 0; i < MAX_CHANNELS; i++)
         {
-                if (mChannels[i])
-                {
-                        delete mChannels[i];
-                        mChannels[i] = NULL;
-                }
+                delete mChannels[i];
+                mChannels[i] = NULL;
         }
 
         // Clean up buffers
         for (i = 0; i < MAX_BUFFERS; i++)
         {
-                if (mBuffers[i])
+                delete mBuffers[i];
+                mBuffers[i] = NULL;
+        }
+
+        delete mInternetStreamMedia;
+        mInternetStreamMedia = NULL;
+        mInternetStreamURL.clear();
+}
+
+
+// virtual
+void LLAudioEngine::startInternetStream(const std::string& url)
+{
+        llinfos << "entered startInternetStream()" << llendl;
+
+        if (!mInternetStreamMedia)
+        {
+                LLMediaManager* mgr = LLMediaManager::getInstance();
+                if (mgr)
                 {
-                        delete mBuffers[i];
-                        mBuffers[i] = NULL;
+                        mInternetStreamMedia = mgr->createSourceFromMimeType(LLURI(url).scheme(), "audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
+                        llinfos << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
+                }
+        }
+
+        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);
+                mInternetStreamMedia->updateMedia();
+        } else {
+                llinfos << "setting stream to NULL"<< llendl;
+                mInternetStreamURL.clear();
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
+                mInternetStreamMedia->updateMedia();
+        }
+        //#endif
+}
+
+// virtual
+void LLAudioEngine::stopInternetStream()
+{
+        llinfos << "entered stopInternetStream()" << llendl;
+        
+        if(mInternetStreamMedia)
+        {
+                if( ! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)){
+                        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
+void LLAudioEngine::updateInternetStream()
+{
+        if (mInternetStreamMedia)
+                mInternetStreamMedia->updateMedia();
+}
+
+// virtual
+int LLAudioEngine::isInternetStreamPlaying()
+{
+        if (!mInternetStreamMedia)
+                return 0;
+        
+        if (mInternetStreamMedia->getStatus() == LLMediaBase::STATUS_STARTED)
+        {
+                return 1; // Active and playing
+        }       
+
+        if (mInternetStreamMedia->getStatus() == LLMediaBase::STATUS_PAUSED)
+        {
+                return 2; // paused
         }
+
+        return 0; // Stopped
+}
+
+// virtual
+void LLAudioEngine::getInternetStreamInfo(char* artist, char* title)
+{
+        artist[0] = 0;
+        title[0] = 0;
+}
+
+// virtual
+void LLAudioEngine::setInternetStreamGain(F32 vol)
+{
+        mInternetStreamGain = vol;
+
+        if(!mInternetStreamMedia)
+                return;
+
+        vol = llclamp(vol, 0.f, 1.f);
+        mInternetStreamMedia->setVolume(vol);
+        mInternetStreamMedia->updateMedia();
+}
+
+// virtual
+const std::string& LLAudioEngine::getInternetStreamURL()
+{
+        return mInternetStreamURL;
 }
 
 
@@ -449,6 +578,8 @@ void LLAudioEngine::idle(F32 max_decode_time)
         // missed picking it up in all the places that can add
         // or request new data.
         startNextTransfer();
+
+        updateInternetStream();
 }
 
 
@@ -758,7 +889,7 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
         LLUUID source_id;
         source_id.generate();
 
-        LLAudioSource *asp = new LLAudioSource(source_id, owner_id, gain);
+        LLAudioSource *asp = new LLAudioSource(source_id, owner_id, gain, type);
         gAudiop->addAudioSource(asp);
         if (pos_global.isExactlyZero())
         {
@@ -1207,18 +1338,18 @@ void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::E
 //
 
 
-LLAudioSource::LLAudioSource(const LLUUID& id, const LLUUID& owner_id, const F32 gain)
+LLAudioSource::LLAudioSource(const LLUUID& id, const LLUUID& owner_id, const F32 gain, const S32 type)
 :       mID(id),
         mOwnerID(owner_id),
         mPriority(0.f),
         mGain(gain),
         mType(type),
-        mAmbient(FALSE),
-        mLoop(FALSE),
-        mSyncMaster(FALSE),
-        mSyncSlave(FALSE),
-        mQueueSounds(FALSE),
-        mPlayedOnce(FALSE),
+        mAmbient(false),
+        mLoop(false),
+        mSyncMaster(false),
+        mSyncSlave(false),
+        mQueueSounds(false),
+        mPlayedOnce(false),
         mChannelp(NULL),
         mCurrentDatap(NULL),
         mQueuedDatap(NULL)
@@ -1364,7 +1495,8 @@ bool LLAudioSource::play(const LLUUID &audio_uuid)
 bool LLAudioSource::isDone()
 {
         const F32 MAX_AGE = 60.f;
-        const F32 MAX_UNPLAYED_AGE = 30.f;
+        const F32 MAX_UNPLAYED_AGE = 15.f;
+
         if (isLoop())
         {
                 // Looped sources never die on their own.
@@ -1542,8 +1674,8 @@ LLAudioBuffer *LLAudioSource::getCurrentBuffer()
 LLAudioChannel::LLAudioChannel() :
         mCurrentSourcep(NULL),
         mCurrentBufferp(NULL),
-        mLoopedThisFrame(FALSE),
-        mWaiting(FALSE),
+        mLoopedThisFrame(false),
+        mWaiting(false),
         mSecondaryGain(1.0f)
 {
 }
@@ -1609,8 +1741,8 @@ bool LLAudioChannel::updateBuffer()
         }
 
         //
-        // The source changed what buffer it's playing.  Whe need to clean up the
-        // existing fmod channel
+        // The source changed what buffer it's playing.  We need to clean up
+        // the existing channel
         //
         cleanup();