diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
| commit | d3ec35fc6c2b8b47336650fe0570995201854a78 (patch) | |
| tree | f2113a1fa374fab76509f4462b2253b315584f65 /indra/llaudio | |
| parent | 4c3377a45abe3c8b2a0e376c62045a8f1260da08 (diff) | |
| parent | 19e0cc93a8af661dbac47552474a704ade600c74 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 2 | ||||
| -rw-r--r-- | indra/llaudio/llaudioengine.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index f0b44f97d2..7f747c2eca 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -215,7 +215,7 @@ BOOL LLVorbisDecodeState::initDecode() return(FALSE); } - S32 sample_count = ov_pcm_total(&mVF, -1); + S32 sample_count = (S32)ov_pcm_total(&mVF, -1); size_t size_guess = (size_t)sample_count; vorbis_info* vi = ov_info(&mVF, -1); size_guess *= (vi? vi->channels : 1); diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index a47ee7ca7c..28b69e1973 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -37,6 +37,7 @@ #include "lluuid.h" #include "llframetimer.h" #include "llassettype.h" +#include "llextendedstatus.h" #include "lllistener.h" |