summaryrefslogtreecommitdiff
path: root/indra/newview/lldeferredsounds.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-01-28 18:27:54 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-01-28 18:27:54 -0800
commit4c5790d4bf24d80fd88f36e85a4aa51d4dc06c30 (patch)
treea90a38f19c88d50f06a5b29c26ae7cd3a0387338 /indra/newview/lldeferredsounds.cpp
parentdaa5084dd611b45d55598dbdebbb673652877176 (diff)
CHUI-667: Post code review changes
Diffstat (limited to 'indra/newview/lldeferredsounds.cpp')
-rw-r--r--indra/newview/lldeferredsounds.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lldeferredsounds.cpp b/indra/newview/lldeferredsounds.cpp
index 2b2b493875..9416e7cd29 100644
--- a/indra/newview/lldeferredsounds.cpp
+++ b/indra/newview/lldeferredsounds.cpp
@@ -29,17 +29,17 @@
#include "lldeferredsounds.h"
-void ui_audio_callback(const LLUUID& uuid);
+#include "llaudioengine.h"
-void LLDeferredSounds::deferSound(LLUUID sound)
+void LLDeferredSounds::deferSound(SoundData& sound)
{
- soundQueue.push(sound);
+ soundVector.push_back(sound);
}
void LLDeferredSounds::playdeferredSounds()
{
- while(soundQueue.size())
+ while(soundVector.size())
{
- ui_audio_callback(soundQueue.front());
- soundQueue.pop();
+ gAudiop->triggerSound(soundVector.back());
+ soundVector.pop_back();
}
}