From a8bc4787b9aa1d1aba1ce69063e93619e3b39d0d Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 11 Jan 2013 02:06:01 +0000
Subject: test commit
---
indra/llaudio/lllistener.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/llaudio')
diff --git a/indra/llaudio/lllistener.cpp b/indra/llaudio/lllistener.cpp
index df2366c8c2..de5adace5d 100644
--- a/indra/llaudio/lllistener.cpp
+++ b/indra/llaudio/lllistener.cpp
@@ -42,6 +42,7 @@ LLListener::LLListener()
//-----------------------------------------------------------------------
LLListener::~LLListener()
{
+ // temporarily adding unnecessary comment to test committing to the repository and builds on TeamCity
}
//-----------------------------------------------------------------------
--
cgit v1.2.3
From b47a7751990b240198d4e868f5a35bbd1b34e4ee Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 14 Jan 2013 18:37:29 +0000
Subject: reverted test commit
---
indra/llaudio/lllistener.cpp | 1 -
1 file changed, 1 deletion(-)
(limited to 'indra/llaudio')
diff --git a/indra/llaudio/lllistener.cpp b/indra/llaudio/lllistener.cpp
index de5adace5d..df2366c8c2 100644
--- a/indra/llaudio/lllistener.cpp
+++ b/indra/llaudio/lllistener.cpp
@@ -42,7 +42,6 @@ LLListener::LLListener()
//-----------------------------------------------------------------------
LLListener::~LLListener()
{
- // temporarily adding unnecessary comment to test committing to the repository and builds on TeamCity
}
//-----------------------------------------------------------------------
--
cgit v1.2.3
From 4c5790d4bf24d80fd88f36e85a4aa51d4dc06c30 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 28 Jan 2013 18:27:54 -0800
Subject: CHUI-667: Post code review changes
---
indra/llaudio/llaudioengine.cpp | 4 ++++
indra/llaudio/llaudioengine.h | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
(limited to 'indra/llaudio')
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index ef560cd7fc..06e752cf34 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -839,6 +839,10 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
asp->play(audio_uuid);
}
+void LLAudioEngine::triggerSound(SoundData& soundData)
+{
+ triggerSound(soundData.audio_uuid, soundData.owner_id, soundData.gain, soundData.type, soundData.pos_global);
+}
void LLAudioEngine::setListenerPos(LLVector3 aVec)
{
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index df1e4dc305..99b96c3c38 100644
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -66,6 +66,7 @@ class LLAudioChannel;
class LLAudioChannelOpenAL;
class LLAudioBuffer;
class LLStreamingAudioInterface;
+struct SoundData;
//
@@ -144,6 +145,8 @@ public:
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);
+ void triggerSound(SoundData& soundData);
+
bool preloadSound(const LLUUID &id);
void addAudioSource(LLAudioSource *asp);
@@ -456,6 +459,27 @@ protected:
LLFrameTimer mLastUseTimer;
};
+struct SoundData
+{
+ LLUUID audio_uuid;
+ LLUUID owner_id;
+ F32 gain;
+ S32 type;
+ LLVector3d pos_global;
+
+ SoundData(const LLUUID &audio_uuid,
+ const LLUUID& owner_id,
+ const F32 gain,
+ const S32 type = LLAudioEngine::AUDIO_TYPE_NONE,
+ const LLVector3d &pos_global = LLVector3d::zero)
+ {
+ this->audio_uuid = audio_uuid;
+ this->owner_id = owner_id;
+ this->gain = gain;
+ this->type = type;
+ this->pos_global = pos_global;
+ }
+};
extern LLAudioEngine* gAudiop;
--
cgit v1.2.3