diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llaudio/audioengine_fmod.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/llaudio/audioengine_fmod.cpp')
-rw-r--r-- | linden/indra/llaudio/audioengine_fmod.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp index 2197a45..938c2aa 100644 --- a/linden/indra/llaudio/audioengine_fmod.cpp +++ b/linden/indra/llaudio/audioengine_fmod.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -659,15 +660,12 @@ bool LLAudioBufferFMOD::loadWAV(const std::string& filename) | |||
659 | return false; | 660 | return false; |
660 | } | 661 | } |
661 | 662 | ||
662 | S32 file_size = 0; | 663 | if (!LLAPRFile::isExist(filename, NULL, LL_APR_RPB)) |
663 | apr_file_t* apr_file = ll_apr_file_open(filename, LL_APR_RPB, &file_size); | ||
664 | if (!apr_file) | ||
665 | { | 664 | { |
666 | // File not found, abort. | 665 | // File not found, abort. |
667 | return false; | 666 | return false; |
668 | } | 667 | } |
669 | apr_file_close(apr_file); | 668 | |
670 | |||
671 | if (mSamplep) | 669 | if (mSamplep) |
672 | { | 670 | { |
673 | // If there's already something loaded in this buffer, clean it up. | 671 | // If there's already something loaded in this buffer, clean it up. |