Second Life viewer sources 1.22.0-RC

4 files changed, 62 insertions, 7 deletions

diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index b662023..ebedcab 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -65,3 +65,10 @@ 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 5dd5b28..298ab1d 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -96,6 +96,9 @@ void LLAudioEngine::setDefaults()
         mMasterGain = 1.f;
         mInternetStreamGain = 0.125f;
         mNextWindUpdate = 0.f;
+
+        for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
+                mSecondaryGain[i] = 1.0f;
 }
 
 
@@ -167,6 +170,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();
@@ -643,6 +653,18 @@ F32 LLAudioEngine::getMasterGain()
         return mMasterGain;
 }
 
+void LLAudioEngine::setSecondaryGain(S32 type, F32 gain)
+{
+        llassert(type < LLAudioEngine::AUDIO_TYPE_COUNT);
+        
+        mSecondaryGain[type] = gain;
+}
+
+F32 LLAudioEngine::getSecondaryGain(S32 type)
+{
+        return mSecondaryGain[type];
+}
+
 F32 LLAudioEngine::getInternetStreamGain()
 {
         return mInternetStreamGain;
@@ -718,7 +740,8 @@ F64 LLAudioEngine::mapWindVecToPan(LLVector3 wind_vec)
 }
 
 
-void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_id, const F32 gain, const LLVector3d &pos_global)
+void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_id, const F32 gain,
+                                                                 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;
@@ -731,7 +754,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())
         {
@@ -1180,11 +1203,12 @@ 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),
@@ -1515,7 +1539,8 @@ LLAudioChannel::LLAudioChannel() :
         mCurrentSourcep(NULL),
         mCurrentBufferp(NULL),
         mLoopedThisFrame(FALSE),
-        mWaiting(FALSE)
+        mWaiting(FALSE),
+        mSecondaryGain(1.0f)
 {
 }
 
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index e38413f..b8153a3 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -78,6 +78,15 @@ class LLAudioBuffer;
 class LLAudioEngine 
 {
 public:
+        enum LLAudioType
+        {
+                AUDIO_TYPE_NONE    = 0,
+                AUDIO_TYPE_SFX     = 1,
+                AUDIO_TYPE_UI      = 2,
+                AUDIO_TYPE_AMBIENT = 3,
+                AUDIO_TYPE_COUNT   = 4 // last
+        };
+        
         LLAudioEngine();
         virtual ~LLAudioEngine();
 
@@ -109,6 +118,9 @@ public:
         F32 getMasterGain();
         void setMasterGain(F32 gain);
 
+        F32 getSecondaryGain(S32 type);
+        void setSecondaryGain(S32 type, F32 gain);
+
         F32 getInternetStreamGain();
 
         virtual void setDopplerFactor(F32 factor);
@@ -122,7 +134,9 @@ public:
 
         // Methods actually related to setting up and removing sounds
         // Owner ID is the owner of the object making the request
-        void triggerSound(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, const LLVector3d &pos_global = LLVector3d::zero);
+        void triggerSound(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain,
+                                          const S32 type = LLAudioEngine::AUDIO_TYPE_NONE,
+                                          const LLVector3d &pos_global = LLVector3d::zero);
         BOOL preloadSound(const LLUUID &id);
 
         void addAudioSource(LLAudioSource *asp);
@@ -222,6 +236,7 @@ protected:
         LLAudioBuffer *mBuffers[MAX_BUFFERS];
         
         F32 mMasterGain;
+        F32 mSecondaryGain[AUDIO_TYPE_COUNT];
 
         // Hack!  Internet streams are treated differently from other sources!
         F32 mInternetStreamGain;
@@ -247,7 +262,7 @@ class LLAudioSource
 public:
         // owner_id is the id of the agent responsible for making this sound
         // play, for example, the owner of the object currently playing it
-        LLAudioSource(const LLUUID &id, const LLUUID& owner_id, const F32 gain);
+        LLAudioSource(const LLUUID &id, const LLUUID& owner_id, const F32 gain, const S32 type = LLAudioEngine::AUDIO_TYPE_NONE);
         virtual ~LLAudioSource();
 
         virtual void update();                                          // Update this audio source
@@ -274,6 +289,9 @@ public:
 
         void setPlayedOnce(const BOOL played_once)                              { mPlayedOnce = played_once; }
 
+        void setType(S32 type)                                  { mType = type; }
+        S32 getType()                                           { return mType; }
+
         void setPositionGlobal(const LLVector3d &position_global)               { mPositionGlobal = position_global; }
         LLVector3d getPositionGlobal() const                                                    { return mPositionGlobal; }
         LLVector3 getVelocity() const                                                                   { return mVelocity; }                           
@@ -312,6 +330,7 @@ protected:
         BOOL                    mSyncSlave;
         BOOL                    mQueueSounds;
         BOOL                    mPlayedOnce;
+        S32             mType;
         LLVector3d              mPositionGlobal;
         LLVector3               mVelocity;
 
@@ -380,6 +399,9 @@ public:
         virtual void setSource(LLAudioSource *sourcep);
         LLAudioSource *getSource() const                        { return mCurrentSourcep; }
 
+        void setSecondaryGain(F32 gain)             { mSecondaryGain = gain; }
+        F32 getSecondaryGain()                      { return mSecondaryGain; }
+
         friend class LLAudioEngine;
         friend class LLAudioSource;
 protected:
@@ -398,6 +420,7 @@ protected:
         LLAudioBuffer   *mCurrentBufferp;
         BOOL                    mLoopedThisFrame;
         BOOL                    mWaiting;       // Waiting for sync.
+        F32             mSecondaryGain;
 };
 
 
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 16d820c..4bf0c95 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -488,7 +488,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;
                 }