summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-02-04 14:04:22 -0800
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-02-04 14:04:22 -0800
commit4c6fc784a685445d22ce7b370d6e376da918e423 (patch)
treef38c5fe4feab20b5f81095c47d4c34e45cab3cb8 /indra/llaudio
parent60448cac910ae7ea7f014976a1015ecb58b215ba (diff)
Point autobuild at newer fmodex builds and fix warning being treated as error in llaudioengine_fmodex.cpp
Diffstat (limited to 'indra/llaudio')
-rw-r--r--indra/llaudio/llaudioengine_fmodex.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index c3c30d87fe..40a43884a1 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -260,7 +260,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
mSystem->getSoftwareFormat(&r_samplerate, NULL, &r_channels, NULL, NULL, &r_bits);
mSystem->getDriverInfo(0, r_name, 255, 0);
r_name[255] = '\0';
- int latency = 1000.0 * r_bufferlength * r_numbuffers /r_samplerate;
+ int latency = (int)(1000.0f * r_bufferlength * r_numbuffers / r_samplerate);
LL_INFOS("AppInit") << "FMOD device: "<< r_name << "\n"
<< "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"