aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llaudio
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llaudio
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llaudio')
-rw-r--r--linden/indra/llaudio/CMakeLists.txt67
-rw-r--r--linden/indra/llaudio/audioengine.cpp10
-rw-r--r--linden/indra/llaudio/audioengine.h10
-rw-r--r--linden/indra/llaudio/audioengine_fmod.cpp37
-rw-r--r--linden/indra/llaudio/audioengine_fmod.h22
-rw-r--r--linden/indra/llaudio/files.lst7
-rw-r--r--linden/indra/llaudio/listener_fmod.cpp7
-rw-r--r--linden/indra/llaudio/listener_fmod.h4
-rw-r--r--linden/indra/llaudio/llaudio.vcproj225
-rw-r--r--linden/indra/llaudio/llaudio_vc8.vcproj323
-rw-r--r--linden/indra/llaudio/llaudio_vc9.vcproj324
-rw-r--r--linden/indra/llaudio/llaudiodecodemgr.cpp22
-rw-r--r--linden/indra/llaudio/vorbisencode.cpp26
-rw-r--r--linden/indra/llaudio/vorbisencode.h4
14 files changed, 124 insertions, 964 deletions
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
new file mode 100644
index 0000000..b662023
--- /dev/null
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -0,0 +1,67 @@
1# -*- cmake -*-
2
3project(llaudio)
4
5include(00-Common)
6include(Audio)
7include(FMOD)
8include(LLCommon)
9include(LLMath)
10include(LLMessage)
11include(LLVFS)
12
13include_directories(
14 ${FMOD_INCLUDE_DIR}
15 ${LLCOMMON_INCLUDE_DIRS}
16 ${LLMATH_INCLUDE_DIRS}
17 ${LLMESSAGE_INCLUDE_DIRS}
18 ${LLVFS_INCLUDE_DIRS}
19 ${OGG_INCLUDE_DIRS}
20 ${VORBISENC_INCLUDE_DIRS}
21 ${VORBISFILE_INCLUDE_DIRS}
22 ${VORBIS_INCLUDE_DIRS}
23 )
24
25set(llaudio_SOURCE_FILES
26 audioengine.cpp
27 listener.cpp
28 llaudiodecodemgr.cpp
29 vorbisdecode.cpp
30 vorbisencode.cpp
31 )
32
33set(llaudio_HEADER_FILES
34 CMakeLists.txt
35
36 audioengine.h
37 listener.h
38 llaudiodecodemgr.h
39 vorbisdecode.h
40 vorbisencode.h
41 )
42
43if (FMOD)
44 list(APPEND llaudio_SOURCE_FILES
45 audioengine_fmod.cpp
46 listener_fmod.cpp
47 )
48
49 list(APPEND llaudio_HEADER_FILES
50 audioengine_fmod.h
51 listener_fmod.h
52 )
53
54 if (LINUX)
55 if (${CXX_VERSION} MATCHES "4.[23]")
56 set_source_files_properties(audioengine_fmod.cpp
57 COMPILE_FLAGS -Wno-error=write-strings)
58 endif (${CXX_VERSION} MATCHES "4.[23]")
59 endif (LINUX)
60endif (FMOD)
61
62set_source_files_properties(${llaudio_HEADER_FILES}
63 PROPERTIES HEADER_FILE_ONLY TRUE)
64
65list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
66
67add_library (llaudio ${llaudio_SOURCE_FILES})
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index af43b42..5dd5b28 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -1,4 +1,4 @@
1/** 1 /**
2 * @file audioengine.cpp 2 * @file audioengine.cpp
3 * @brief implementation of LLAudioEngine class abstracting the Open 3 * @brief implementation of LLAudioEngine class abstracting the Open
4 * AL audio support 4 * AL audio support
@@ -916,7 +916,7 @@ void LLAudioEngine::cleanupAudioSource(LLAudioSource *asp)
916 916
917BOOL LLAudioEngine::hasDecodedFile(const LLUUID &uuid) 917BOOL LLAudioEngine::hasDecodedFile(const LLUUID &uuid)
918{ 918{
919 char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/ 919 std::string uuid_str;
920 uuid.toString(uuid_str); 920 uuid.toString(uuid_str);
921 921
922 std::string wav_path; 922 std::string wav_path;
@@ -1653,10 +1653,10 @@ BOOL LLAudioData::load()
1653 return FALSE; 1653 return FALSE;
1654 } 1654 }
1655 1655
1656 char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/ 1656 std::string uuid_str;
1657 char wav_path[MAX_PATH]; /*Flawfinder: ignore*/ 1657 std::string wav_path;
1658 mID.toString(uuid_str); 1658 mID.toString(uuid_str);
1659 snprintf(wav_path, MAX_PATH, "%s.dsf",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str()); /* Flawfinder: ignore */ 1659 wav_path= gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + ".dsf";
1660 1660
1661 if (!mBufferp->loadWAV(wav_path)) 1661 if (!mBufferp->loadWAV(wav_path))
1662 { 1662 {
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 8994703..e38413f 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -36,10 +36,6 @@
36#include <list> 36#include <list>
37#include <map> 37#include <map>
38 38
39#ifndef LL_FMOD
40# define LL_FMOD 1
41#endif
42
43#include "listener.h" 39#include "listener.h"
44#include "v3math.h" 40#include "v3math.h"
45#include "v3dmath.h" 41#include "v3dmath.h"
@@ -136,14 +132,14 @@ public:
136 LLAudioData *getAudioData(const LLUUID &audio_uuid); 132 LLAudioData *getAudioData(const LLUUID &audio_uuid);
137 133
138 134
139 virtual void startInternetStream(const char* url) = 0; 135 virtual void startInternetStream(const std::string& url) = 0;
140 virtual void stopInternetStream() = 0; 136 virtual void stopInternetStream() = 0;
141 virtual void pauseInternetStream(int pause) = 0; 137 virtual void pauseInternetStream(int pause) = 0;
142 virtual int isInternetStreamPlaying() = 0; 138 virtual int isInternetStreamPlaying() = 0;
143 virtual void getInternetStreamInfo(char* artist, char* title) { artist[0] = 0; title[0] = 0; } 139 virtual void getInternetStreamInfo(char* artist, char* title) { artist[0] = 0; title[0] = 0; }
144 // use a value from 0.0 to 1.0, inclusive 140 // use a value from 0.0 to 1.0, inclusive
145 virtual void setInternetStreamGain(F32 vol) { mInternetStreamGain = vol; } 141 virtual void setInternetStreamGain(F32 vol) { mInternetStreamGain = vol; }
146 virtual const char* getInternetStreamURL() { return ""; } 142 virtual const std::string& getInternetStreamURL() { return LLStringUtil::null; }
147 143
148 // For debugging usage 144 // For debugging usage
149 virtual LLVector3 getListenerPos(); 145 virtual LLVector3 getListenerPos();
@@ -416,7 +412,7 @@ class LLAudioBuffer
416{ 412{
417public: 413public:
418 virtual ~LLAudioBuffer() {}; 414 virtual ~LLAudioBuffer() {};
419 virtual BOOL loadWAV(const char *filename) = 0; 415 virtual BOOL loadWAV(const std::string& filename) = 0;
420 virtual U32 getLength() = 0; 416 virtual U32 getLength() = 0;
421 417
422 friend class LLAudioEngine; 418 friend class LLAudioEngine;
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index cc2042d..16d820c 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -33,9 +33,6 @@
33#include "linden_common.h" 33#include "linden_common.h"
34 34
35#include "audioengine_fmod.h" 35#include "audioengine_fmod.h"
36
37#if LL_FMOD
38
39#include "listener_fmod.h" 36#include "listener_fmod.h"
40 37
41#include "llerror.h" 38#include "llerror.h"
@@ -72,7 +69,7 @@ F32 gCurrentPanGainR = 0.5f;
72 69
73 70
74// Safe strcpy 71// Safe strcpy
75#if LL_WINDOWS || LL_LINUX 72#if 0 //(unused) //LL_WINDOWS || LL_LINUX
76static size_t strlcpy( char* dest, const char* src, size_t dst_size ) 73static size_t strlcpy( char* dest, const char* src, size_t dst_size )
77{ 74{
78 size_t source_len = 0; 75 size_t source_len = 0;
@@ -655,11 +652,11 @@ LLAudioBufferFMOD::~LLAudioBufferFMOD()
655} 652}
656 653
657 654
658BOOL LLAudioBufferFMOD::loadWAV(const char *filename) 655BOOL LLAudioBufferFMOD::loadWAV(const std::string& filename)
659{ 656{
660 // Try to open a wav file from disk. This will eventually go away, as we don't 657 // Try to open a wav file from disk. This will eventually go away, as we don't
661 // really want to block doing this. 658 // really want to block doing this.
662 if (filename == NULL) 659 if (filename.empty())
663 { 660 {
664 // invalid filename, abort. 661 // invalid filename, abort.
665 return FALSE; 662 return FALSE;
@@ -705,7 +702,7 @@ BOOL LLAudioBufferFMOD::loadWAV(const char *filename)
705 fclose(sound_file); 702 fclose(sound_file);
706 } 703 }
707#else 704#else
708 mSamplep = FSOUND_Sample_Load(FSOUND_UNMANAGED, filename, FSOUND_LOOP_NORMAL, 0, 0); 705 mSamplep = FSOUND_Sample_Load(FSOUND_UNMANAGED, filename.c_str(), FSOUND_LOOP_NORMAL, 0, 0);
709#endif 706#endif
710 707
711 if (!mSamplep) 708 if (!mSamplep)
@@ -777,11 +774,11 @@ void LLAudioEngine_FMOD::initInternetStream()
777 774
778 // Leave the net buffer properties at the default. 775 // Leave the net buffer properties at the default.
779 //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80); 776 //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
780 mInternetStreamURL[0] = 0; 777 mInternetStreamURL.clear();
781} 778}
782 779
783 780
784void LLAudioEngine_FMOD::startInternetStream(const char* url) 781void LLAudioEngine_FMOD::startInternetStream(const std::string& url)
785{ 782{
786 if (!mInited) 783 if (!mInited)
787 { 784 {
@@ -791,16 +788,16 @@ void LLAudioEngine_FMOD::startInternetStream(const char* url)
791 788
792 // "stop" stream but don't clear url, etc. in calse url == mInternetStreamURL 789 // "stop" stream but don't clear url, etc. in calse url == mInternetStreamURL
793 stopInternetStream(); 790 stopInternetStream();
794 if (url) 791 if (!url.empty())
795 { 792 {
796 llinfos << "Starting internet stream: " << url << llendl; 793 llinfos << "Starting internet stream: " << url << llendl;
797 mCurrentInternetStreamp = new LLAudioStreamFMOD(url); 794 mCurrentInternetStreamp = new LLAudioStreamFMOD(url);
798 strlcpy(mInternetStreamURL, url, 1024); 795 mInternetStreamURL = url;
799 } 796 }
800 else 797 else
801 { 798 {
802 llinfos << "Set internet stream to null" << llendl; 799 llinfos << "Set internet stream to null" << llendl;
803 mInternetStreamURL[0] = 0; 800 mInternetStreamURL.clear();
804 } 801 }
805} 802}
806 803
@@ -930,7 +927,7 @@ void LLAudioEngine_FMOD::stopInternetStream()
930 mDeadStreams.push_back(mCurrentInternetStreamp); 927 mDeadStreams.push_back(mCurrentInternetStreamp);
931 } 928 }
932 mCurrentInternetStreamp = NULL; 929 mCurrentInternetStreamp = NULL;
933 //mInternetStreamURL[0] = 0; 930 //mInternetStreamURL.clear();
934 } 931 }
935} 932}
936 933
@@ -963,7 +960,7 @@ int LLAudioEngine_FMOD::isInternetStreamPlaying()
963 { 960 {
964 return 1; // Active and playing 961 return 1; // Active and playing
965 } 962 }
966 else if (mInternetStreamURL[0]) 963 else if (!mInternetStreamURL.empty())
967 { 964 {
968 return 2; // "Paused" 965 return 2; // "Paused"
969 } 966 }
@@ -993,19 +990,18 @@ void LLAudioEngine_FMOD::setInternetStreamGain(F32 vol)
993} 990}
994 991
995 992
996const char* LLAudioEngine_FMOD::getInternetStreamURL() 993const std::string& LLAudioEngine_FMOD::getInternetStreamURL()
997{ 994{
998 return mInternetStreamURL; 995 return mInternetStreamURL;
999} 996}
1000 997
1001 998
1002LLAudioStreamFMOD::LLAudioStreamFMOD(const char *url) : 999LLAudioStreamFMOD::LLAudioStreamFMOD(const std::string& url) :
1003 mInternetStream(NULL), 1000 mInternetStream(NULL),
1004 mReady(FALSE) 1001 mReady(FALSE)
1005{ 1002{
1006 mInternetStreamURL[0] = 0; 1003 mInternetStreamURL = url;
1007 strlcpy(mInternetStreamURL, url, 1024); 1004 mInternetStream = FSOUND_Stream_Open(url.c_str(), FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
1008 mInternetStream = FSOUND_Stream_Open(url, FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
1009 if (!mInternetStream) 1005 if (!mInternetStream)
1010 { 1006 {
1011 llwarns << "Couldn't open fmod stream, error " 1007 llwarns << "Couldn't open fmod stream, error "
@@ -1171,6 +1167,3 @@ void * F_CALLBACKAPI windCallback(void *originalbuffer, void *newbuffer, int len
1171 1167
1172 return newbuffer; 1168 return newbuffer;
1173} 1169}
1174
1175#endif // LL_FMOD
1176
diff --git a/linden/indra/llaudio/audioengine_fmod.h b/linden/indra/llaudio/audioengine_fmod.h
index 3ee4334..41177b6 100644
--- a/linden/indra/llaudio/audioengine_fmod.h
+++ b/linden/indra/llaudio/audioengine_fmod.h
@@ -34,9 +34,6 @@
34#define LL_AUDIOENGINE_FMOD_H 34#define LL_AUDIOENGINE_FMOD_H
35 35
36#include "audioengine.h" 36#include "audioengine.h"
37
38#if LL_FMOD
39
40#include "listener_fmod.h" 37#include "listener_fmod.h"
41 38
42#include "fmod.h" 39#include "fmod.h"
@@ -59,14 +56,14 @@ public:
59 56
60 // Internet stream methods 57 // Internet stream methods
61 virtual void initInternetStream(); 58 virtual void initInternetStream();
62 virtual void startInternetStream(const char* url); 59 virtual void startInternetStream(const std::string& url);
63 virtual void updateInternetStream(); 60 virtual void updateInternetStream();
64 virtual void stopInternetStream(); 61 virtual void stopInternetStream();
65 virtual void pauseInternetStream(int pause); 62 virtual void pauseInternetStream(int pause);
66 virtual int isInternetStreamPlaying(); 63 virtual int isInternetStreamPlaying();
67 virtual void getInternetStreamInfo(char* artist, char* title); 64 virtual void getInternetStreamInfo(char* artist, char* title);
68 virtual void setInternetStreamGain(F32 vol); 65 virtual void setInternetStreamGain(F32 vol);
69 virtual const char* getInternetStreamURL(); 66 virtual const std::string& getInternetStreamURL();
70 67
71 /*virtual*/ void initWind(); 68 /*virtual*/ void initWind();
72 /*virtual*/ void cleanupWind(); 69 /*virtual*/ void cleanupWind();
@@ -82,7 +79,7 @@ protected:
82 static signed char F_CALLBACKAPI callbackMetaData(char* name, char* value, void* userdata); 79 static signed char F_CALLBACKAPI callbackMetaData(char* name, char* value, void* userdata);
83 80
84 LLAudioStreamFMOD *mCurrentInternetStreamp; 81 LLAudioStreamFMOD *mCurrentInternetStreamp;
85 char mInternetStreamURL[1024]; /*Flawfinder: ignore*/ 82 std::string mInternetStreamURL;
86 int mInternetStreamChannel; 83 int mInternetStreamChannel;
87 84
88 std::list<LLAudioStreamFMOD *> mDeadStreams; 85 std::list<LLAudioStreamFMOD *> mDeadStreams;
@@ -127,7 +124,7 @@ public:
127 LLAudioBufferFMOD(); 124 LLAudioBufferFMOD();
128 virtual ~LLAudioBufferFMOD(); 125 virtual ~LLAudioBufferFMOD();
129 126
130 /*virtual*/ BOOL loadWAV(const char *filename); 127 /*virtual*/ BOOL loadWAV(const std::string& filename);
131 /*virtual*/ U32 getLength(); 128 /*virtual*/ U32 getLength();
132 friend class LLAudioChannelFMOD; 129 friend class LLAudioChannelFMOD;
133 130
@@ -141,22 +138,19 @@ protected:
141class LLAudioStreamFMOD 138class LLAudioStreamFMOD
142{ 139{
143public: 140public:
144 LLAudioStreamFMOD(const char *url); 141 LLAudioStreamFMOD(const std::string& url);
145 int startStream(); 142 int startStream();
146 BOOL stopStream(); // Returns true if the stream was successfully stopped. 143 BOOL stopStream(); // Returns true if the stream was successfully stopped.
147 BOOL ready(); 144 BOOL ready();
148 145
149 char *getURL() { return mInternetStreamURL; } 146 const std::string& getURL() { return mInternetStreamURL; }
150 147
151 int getOpenState(); 148 int getOpenState();
152protected: 149protected:
153 FSOUND_STREAM* mInternetStream; 150 FSOUND_STREAM* mInternetStream;
154 BOOL mReady; 151 BOOL mReady;
155 152
156 char mInternetStreamURL[1024]; /*Flawfinder: ignore*/ 153 std::string mInternetStreamURL;
157}; 154};
158 155
159#endif 156#endif // LL_AUDIOENGINE_FMOD_H
160
161#endif
162
diff --git a/linden/indra/llaudio/files.lst b/linden/indra/llaudio/files.lst
deleted file mode 100644
index abc8710..0000000
--- a/linden/indra/llaudio/files.lst
+++ /dev/null
@@ -1,7 +0,0 @@
1llaudio/audioengine.cpp
2llaudio/audioengine_fmod.cpp
3llaudio/listener.cpp
4llaudio/listener_fmod.cpp
5llaudio/llaudiodecodemgr.cpp
6llaudio/vorbisdecode.cpp
7llaudio/vorbisencode.cpp
diff --git a/linden/indra/llaudio/listener_fmod.cpp b/linden/indra/llaudio/listener_fmod.cpp
index e80a775..9e48408 100644
--- a/linden/indra/llaudio/listener_fmod.cpp
+++ b/linden/indra/llaudio/listener_fmod.cpp
@@ -32,9 +32,6 @@
32 32
33#include "linden_common.h" 33#include "linden_common.h"
34#include "audioengine.h" 34#include "audioengine.h"
35
36#if LL_FMOD
37
38#include "listener_fmod.h" 35#include "listener_fmod.h"
39#include "fmod.h" 36#include "fmod.h"
40 37
@@ -143,7 +140,3 @@ F32 LLListener_FMOD::getDistanceFactor()
143{ 140{
144 return mDistanceFactor; 141 return mDistanceFactor;
145} 142}
146
147#endif // LL_FMOD
148
149
diff --git a/linden/indra/llaudio/listener_fmod.h b/linden/indra/llaudio/listener_fmod.h
index 71604bd..7b7c4c6 100644
--- a/linden/indra/llaudio/listener_fmod.h
+++ b/linden/indra/llaudio/listener_fmod.h
@@ -37,15 +37,11 @@
37 37
38class LLListener_FMOD : public LLListener 38class LLListener_FMOD : public LLListener
39{ 39{
40 private:
41 protected: 40 protected:
42 F32 mDopplerFactor; 41 F32 mDopplerFactor;
43 F32 mDistanceFactor; 42 F32 mDistanceFactor;
44 F32 mRolloffFactor; 43 F32 mRolloffFactor;
45 public:
46 44
47 private:
48 protected:
49 public: 45 public:
50 LLListener_FMOD(); 46 LLListener_FMOD();
51 virtual ~LLListener_FMOD(); 47 virtual ~LLListener_FMOD();
diff --git a/linden/indra/llaudio/llaudio.vcproj b/linden/indra/llaudio/llaudio.vcproj
deleted file mode 100644
index dee6916..0000000
--- a/linden/indra/llaudio/llaudio.vcproj
+++ /dev/null
@@ -1,225 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="7.10"
5 Name="llaudio"
6 ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
7 RootNamespace="llaudio"
8 Keyword="Win32Proj">
9 <Platforms>
10 <Platform
11 Name="Win32"/>
12 </Platforms>
13 <Configurations>
14 <Configuration
15 Name="Debug|Win32"
16 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
17 IntermediateDirectory="Debug"
18 ConfigurationType="4"
19 CharacterSet="1">
20 <Tool
21 Name="VCCLCompilerTool"
22 Optimization="0"
23 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
24 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
25 MinimalRebuild="TRUE"
26 BasicRuntimeChecks="3"
27 RuntimeLibrary="1"
28 StructMemberAlignment="4"
29 ForceConformanceInForLoopScope="TRUE"
30 UsePrecompiledHeader="0"
31 WarningLevel="3"
32 WarnAsError="TRUE"
33 Detect64BitPortabilityProblems="FALSE"
34 DebugInformationFormat="4"/>
35 <Tool
36 Name="VCCustomBuildTool"/>
37 <Tool
38 Name="VCLibrarianTool"
39 OutputFile="$(OutDir)/llaudio.lib"/>
40 <Tool
41 Name="VCMIDLTool"/>
42 <Tool
43 Name="VCPostBuildEventTool"/>
44 <Tool
45 Name="VCPreBuildEventTool"/>
46 <Tool
47 Name="VCPreLinkEventTool"/>
48 <Tool
49 Name="VCResourceCompilerTool"/>
50 <Tool
51 Name="VCWebServiceProxyGeneratorTool"/>
52 <Tool
53 Name="VCXMLDataGeneratorTool"/>
54 <Tool
55 Name="VCManagedWrapperGeneratorTool"/>
56 <Tool
57 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
58 </Configuration>
59 <Configuration
60 Name="Release|Win32"
61 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
62 IntermediateDirectory="Release"
63 ConfigurationType="4"
64 CharacterSet="1">
65 <Tool
66 Name="VCCLCompilerTool"
67 AdditionalOptions="/Oy-"
68 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
69 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
70 RuntimeLibrary="0"
71 StructMemberAlignment="0"
72 ForceConformanceInForLoopScope="TRUE"
73 UsePrecompiledHeader="0"
74 WarningLevel="3"
75 WarnAsError="TRUE"
76 Detect64BitPortabilityProblems="FALSE"
77 DebugInformationFormat="3"/>
78 <Tool
79 Name="VCCustomBuildTool"/>
80 <Tool
81 Name="VCLibrarianTool"
82 OutputFile="$(OutDir)/llaudio.lib"/>
83 <Tool
84 Name="VCMIDLTool"/>
85 <Tool
86 Name="VCPostBuildEventTool"/>
87 <Tool
88 Name="VCPreBuildEventTool"/>
89 <Tool
90 Name="VCPreLinkEventTool"/>
91 <Tool
92 Name="VCResourceCompilerTool"/>
93 <Tool
94 Name="VCWebServiceProxyGeneratorTool"/>
95 <Tool
96 Name="VCXMLDataGeneratorTool"/>
97 <Tool
98 Name="VCManagedWrapperGeneratorTool"/>
99 <Tool
100 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
101 </Configuration>
102 <Configuration
103 Name="ReleaseNoOpt|Win32"
104 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
105 IntermediateDirectory="$(ConfigurationName)"
106 ConfigurationType="4"
107 CharacterSet="1">
108 <Tool
109 Name="VCCLCompilerTool"
110 AdditionalOptions="/Oy-"
111 Optimization="0"
112 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
113 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
114 RuntimeLibrary="0"
115 StructMemberAlignment="0"
116 ForceConformanceInForLoopScope="TRUE"
117 UsePrecompiledHeader="0"
118 WarningLevel="3"
119 WarnAsError="TRUE"
120 Detect64BitPortabilityProblems="FALSE"
121 DebugInformationFormat="3"/>
122 <Tool
123 Name="VCCustomBuildTool"/>
124 <Tool
125 Name="VCLibrarianTool"
126 OutputFile="$(OutDir)/llaudio.lib"/>
127 <Tool
128 Name="VCMIDLTool"/>
129 <Tool
130 Name="VCPostBuildEventTool"/>
131 <Tool
132 Name="VCPreBuildEventTool"/>
133 <Tool
134 Name="VCPreLinkEventTool"/>
135 <Tool
136 Name="VCResourceCompilerTool"/>
137 <Tool
138 Name="VCWebServiceProxyGeneratorTool"/>
139 <Tool
140 Name="VCXMLDataGeneratorTool"/>
141 <Tool
142 Name="VCManagedWrapperGeneratorTool"/>
143 <Tool
144 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
145 </Configuration>
146 </Configurations>
147 <References>
148 </References>
149 <Files>
150 <Filter
151 Name="Source Files"
152 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
153 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
154 <File
155 RelativePath=".\audioengine.cpp">
156 </File>
157 <File
158 RelativePath=".\audioengine_fmod.cpp">
159 </File>
160 <File
161 RelativePath=".\listener.cpp">
162 </File>
163 <File
164 RelativePath=".\listener_fmod.cpp">
165 </File>
166 <File
167 RelativePath=".\llaudiodecodemgr.cpp">
168 </File>
169 <File
170 RelativePath=".\vorbisdecode.cpp">
171 </File>
172 <File
173 RelativePath=".\vorbisencode.cpp">
174 </File>
175 </Filter>
176 <Filter
177 Name="Header Files"
178 Filter="h;hpp;hxx;hm;inl;inc;xsd"
179 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
180 <File
181 RelativePath=".\audioengine.h">
182 </File>
183 <File
184 RelativePath=".\audioengine_fmod.h">
185 </File>
186 <File
187 RelativePath=".\fmod.h">
188 </File>
189 <File
190 RelativePath=".\fmod_errors.h">
191 </File>
192 <File
193 RelativePath=".\listener.h">
194 </File>
195 <File
196 RelativePath=".\listener_ds3d.h">
197 </File>
198 <File
199 RelativePath=".\listener_fmod.h">
200 </File>
201 <File
202 RelativePath=".\listener_openal.h">
203 </File>
204 <File
205 RelativePath=".\llaudiodecodemgr.h">
206 </File>
207 <File
208 RelativePath=".\vorbisdecode.h">
209 </File>
210 <File
211 RelativePath=".\vorbisencode.h">
212 </File>
213 <File
214 RelativePath=".\wavefile.h">
215 </File>
216 </Filter>
217 <Filter
218 Name="Resource Files"
219 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
220 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
221 </Filter>
222 </Files>
223 <Globals>
224 </Globals>
225</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudio_vc8.vcproj b/linden/indra/llaudio/llaudio_vc8.vcproj
deleted file mode 100644
index 6cfe76c..0000000
--- a/linden/indra/llaudio/llaudio_vc8.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8.00"
5 Name="llaudio"
6 ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
7 RootNamespace="llaudio"
8 Keyword="Win32Proj"
9 >
10 <Platforms>
11 <Platform
12 Name="Win32"
13 />
14 </Platforms>
15 <ToolFiles>
16 </ToolFiles>
17 <Configurations>
18 <Configuration
19 Name="Debug|Win32"
20 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
21 IntermediateDirectory="Debug"
22 ConfigurationType="4"
23 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
24 CharacterSet="1"
25 >
26 <Tool
27 Name="VCPreBuildEventTool"
28 />
29 <Tool
30 Name="VCCustomBuildTool"
31 />
32 <Tool
33 Name="VCXMLDataGeneratorTool"
34 />
35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"
37 />
38 <Tool
39 Name="VCMIDLTool"
40 />
41 <Tool
42 Name="VCCLCompilerTool"
43 Optimization="0"
44 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
45 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
46 MinimalRebuild="true"
47 BasicRuntimeChecks="3"
48 RuntimeLibrary="1"
49 StructMemberAlignment="4"
50 TreatWChar_tAsBuiltInType="false"
51 ForceConformanceInForLoopScope="true"
52 UsePrecompiledHeader="0"
53 WarningLevel="3"
54 WarnAsError="true"
55 Detect64BitPortabilityProblems="false"
56 DebugInformationFormat="4"
57 />
58 <Tool
59 Name="VCManagedResourceCompilerTool"
60 />
61 <Tool
62 Name="VCResourceCompilerTool"
63 />
64 <Tool
65 Name="VCPreLinkEventTool"
66 />
67 <Tool
68 Name="VCLibrarianTool"
69 OutputFile="$(OutDir)/llaudio.lib"
70 />
71 <Tool
72 Name="VCALinkTool"
73 />
74 <Tool
75 Name="VCXDCMakeTool"
76 />
77 <Tool
78 Name="VCBscMakeTool"
79 />
80 <Tool
81 Name="VCFxCopTool"
82 />
83 <Tool
84 Name="VCPostBuildEventTool"
85 />
86 </Configuration>
87 <Configuration
88 Name="Release|Win32"
89 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
90 IntermediateDirectory="Release"
91 ConfigurationType="4"
92 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
93 CharacterSet="1"
94 >
95 <Tool
96 Name="VCPreBuildEventTool"
97 />
98 <Tool
99 Name="VCCustomBuildTool"
100 />
101 <Tool
102 Name="VCXMLDataGeneratorTool"
103 />
104 <Tool
105 Name="VCWebServiceProxyGeneratorTool"
106 />
107 <Tool
108 Name="VCMIDLTool"
109 />
110 <Tool
111 Name="VCCLCompilerTool"
112 AdditionalOptions="/Oy-"
113 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
114 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
115 RuntimeLibrary="0"
116 StructMemberAlignment="0"
117 TreatWChar_tAsBuiltInType="false"
118 ForceConformanceInForLoopScope="true"
119 UsePrecompiledHeader="0"
120 WarningLevel="3"
121 WarnAsError="true"
122 Detect64BitPortabilityProblems="false"
123 DebugInformationFormat="3"
124 />
125 <Tool
126 Name="VCManagedResourceCompilerTool"
127 />
128 <Tool
129 Name="VCResourceCompilerTool"
130 />
131 <Tool
132 Name="VCPreLinkEventTool"
133 />
134 <Tool
135 Name="VCLibrarianTool"
136 OutputFile="$(OutDir)/llaudio.lib"
137 />
138 <Tool
139 Name="VCALinkTool"
140 />
141 <Tool
142 Name="VCXDCMakeTool"
143 />
144 <Tool
145 Name="VCBscMakeTool"
146 />
147 <Tool
148 Name="VCFxCopTool"
149 />
150 <Tool
151 Name="VCPostBuildEventTool"
152 />
153 </Configuration>
154 <Configuration
155 Name="ReleaseNoOpt|Win32"
156 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
157 IntermediateDirectory="$(ConfigurationName)"
158 ConfigurationType="4"
159 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
160 CharacterSet="1"
161 >
162 <Tool
163 Name="VCPreBuildEventTool"
164 />
165 <Tool
166 Name="VCCustomBuildTool"
167 />
168 <Tool
169 Name="VCXMLDataGeneratorTool"
170 />
171 <Tool
172 Name="VCWebServiceProxyGeneratorTool"
173 />
174 <Tool
175 Name="VCMIDLTool"
176 />
177 <Tool
178 Name="VCCLCompilerTool"
179 AdditionalOptions="/Oy-"
180 Optimization="0"
181 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
182 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
183 RuntimeLibrary="0"
184 StructMemberAlignment="0"
185 TreatWChar_tAsBuiltInType="false"
186 ForceConformanceInForLoopScope="true"
187 UsePrecompiledHeader="0"
188 WarningLevel="3"
189 WarnAsError="true"
190 Detect64BitPortabilityProblems="false"
191 DebugInformationFormat="3"
192 />
193 <Tool
194 Name="VCManagedResourceCompilerTool"
195 />
196 <Tool
197 Name="VCResourceCompilerTool"
198 />
199 <Tool
200 Name="VCPreLinkEventTool"
201 />
202 <Tool
203 Name="VCLibrarianTool"
204 OutputFile="$(OutDir)/llaudio.lib"
205 />
206 <Tool
207 Name="VCALinkTool"
208 />
209 <Tool
210 Name="VCXDCMakeTool"
211 />
212 <Tool
213 Name="VCBscMakeTool"
214 />
215 <Tool
216 Name="VCFxCopTool"
217 />
218 <Tool
219 Name="VCPostBuildEventTool"
220 />
221 </Configuration>
222 </Configurations>
223 <References>
224 </References>
225 <Files>
226 <Filter
227 Name="Source Files"
228 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
229 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
230 >
231 <File
232 RelativePath=".\audioengine.cpp"
233 >
234 </File>
235 <File
236 RelativePath=".\audioengine_fmod.cpp"
237 >
238 </File>
239 <File
240 RelativePath=".\listener.cpp"
241 >
242 </File>
243 <File
244 RelativePath=".\listener_fmod.cpp"
245 >
246 </File>
247 <File
248 RelativePath=".\llaudiodecodemgr.cpp"
249 >
250 </File>
251 <File
252 RelativePath=".\vorbisdecode.cpp"
253 >
254 </File>
255 <File
256 RelativePath=".\vorbisencode.cpp"
257 >
258 </File>
259 </Filter>
260 <Filter
261 Name="Header Files"
262 Filter="h;hpp;hxx;hm;inl;inc;xsd"
263 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
264 >
265 <File
266 RelativePath=".\audioengine.h"
267 >
268 </File>
269 <File
270 RelativePath=".\audioengine_fmod.h"
271 >
272 </File>
273 <File
274 RelativePath=".\fmod.h"
275 >
276 </File>
277 <File
278 RelativePath=".\fmod_errors.h"
279 >
280 </File>
281 <File
282 RelativePath=".\listener.h"
283 >
284 </File>
285 <File
286 RelativePath=".\listener_ds3d.h"
287 >
288 </File>
289 <File
290 RelativePath=".\listener_fmod.h"
291 >
292 </File>
293 <File
294 RelativePath=".\listener_openal.h"
295 >
296 </File>
297 <File
298 RelativePath=".\llaudiodecodemgr.h"
299 >
300 </File>
301 <File
302 RelativePath=".\vorbisdecode.h"
303 >
304 </File>
305 <File
306 RelativePath=".\vorbisencode.h"
307 >
308 </File>
309 <File
310 RelativePath=".\wavefile.h"
311 >
312 </File>
313 </Filter>
314 <Filter
315 Name="Resource Files"
316 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
317 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
318 >
319 </Filter>
320 </Files>
321 <Globals>
322 </Globals>
323</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudio_vc9.vcproj b/linden/indra/llaudio/llaudio_vc9.vcproj
deleted file mode 100644
index e51623c..0000000
--- a/linden/indra/llaudio/llaudio_vc9.vcproj
+++ /dev/null
@@ -1,324 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9.00"
5 Name="llaudio"
6 ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
7 RootNamespace="llaudio"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 </Platforms>
16 <ToolFiles>
17 </ToolFiles>
18 <Configurations>
19 <Configuration
20 Name="Debug|Win32"
21 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
22 IntermediateDirectory="Debug"
23 ConfigurationType="4"
24 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
25 CharacterSet="1"
26 >
27 <Tool
28 Name="VCPreBuildEventTool"
29 />
30 <Tool
31 Name="VCCustomBuildTool"
32 />
33 <Tool
34 Name="VCXMLDataGeneratorTool"
35 />
36 <Tool
37 Name="VCWebServiceProxyGeneratorTool"
38 />
39 <Tool
40 Name="VCMIDLTool"
41 />
42 <Tool
43 Name="VCCLCompilerTool"
44 Optimization="0"
45 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
46 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
47 MinimalRebuild="true"
48 BasicRuntimeChecks="3"
49 RuntimeLibrary="1"
50 StructMemberAlignment="4"
51 TreatWChar_tAsBuiltInType="false"
52 ForceConformanceInForLoopScope="true"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 WarnAsError="true"
56 Detect64BitPortabilityProblems="false"
57 DebugInformationFormat="4"
58 />
59 <Tool
60 Name="VCManagedResourceCompilerTool"
61 />
62 <Tool
63 Name="VCResourceCompilerTool"
64 />
65 <Tool
66 Name="VCPreLinkEventTool"
67 />
68 <Tool
69 Name="VCLibrarianTool"
70 OutputFile="$(OutDir)/llaudio.lib"
71 />
72 <Tool
73 Name="VCALinkTool"
74 />
75 <Tool
76 Name="VCXDCMakeTool"
77 />
78 <Tool
79 Name="VCBscMakeTool"
80 />
81 <Tool
82 Name="VCFxCopTool"
83 />
84 <Tool
85 Name="VCPostBuildEventTool"
86 />
87 </Configuration>
88 <Configuration
89 Name="Release|Win32"
90 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
91 IntermediateDirectory="Release"
92 ConfigurationType="4"
93 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
94 CharacterSet="1"
95 >
96 <Tool
97 Name="VCPreBuildEventTool"
98 />
99 <Tool
100 Name="VCCustomBuildTool"
101 />
102 <Tool
103 Name="VCXMLDataGeneratorTool"
104 />
105 <Tool
106 Name="VCWebServiceProxyGeneratorTool"
107 />
108 <Tool
109 Name="VCMIDLTool"
110 />
111 <Tool
112 Name="VCCLCompilerTool"
113 AdditionalOptions="/Oy-"
114 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
115 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
116 RuntimeLibrary="0"
117 StructMemberAlignment="0"
118 TreatWChar_tAsBuiltInType="false"
119 ForceConformanceInForLoopScope="true"
120 UsePrecompiledHeader="0"
121 WarningLevel="3"
122 WarnAsError="true"
123 Detect64BitPortabilityProblems="false"
124 DebugInformationFormat="3"
125 />
126 <Tool
127 Name="VCManagedResourceCompilerTool"
128 />
129 <Tool
130 Name="VCResourceCompilerTool"
131 />
132 <Tool
133 Name="VCPreLinkEventTool"
134 />
135 <Tool
136 Name="VCLibrarianTool"
137 OutputFile="$(OutDir)/llaudio.lib"
138 />
139 <Tool
140 Name="VCALinkTool"
141 />
142 <Tool
143 Name="VCXDCMakeTool"
144 />
145 <Tool
146 Name="VCBscMakeTool"
147 />
148 <Tool
149 Name="VCFxCopTool"
150 />
151 <Tool
152 Name="VCPostBuildEventTool"
153 />
154 </Configuration>
155 <Configuration
156 Name="ReleaseNoOpt|Win32"
157 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
158 IntermediateDirectory="$(ConfigurationName)"
159 ConfigurationType="4"
160 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
161 CharacterSet="1"
162 >
163 <Tool
164 Name="VCPreBuildEventTool"
165 />
166 <Tool
167 Name="VCCustomBuildTool"
168 />
169 <Tool
170 Name="VCXMLDataGeneratorTool"
171 />
172 <Tool
173 Name="VCWebServiceProxyGeneratorTool"
174 />
175 <Tool
176 Name="VCMIDLTool"
177 />
178 <Tool
179 Name="VCCLCompilerTool"
180 AdditionalOptions="/Oy-"
181 Optimization="0"
182 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
183 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
184 RuntimeLibrary="0"
185 StructMemberAlignment="0"
186 TreatWChar_tAsBuiltInType="false"
187 ForceConformanceInForLoopScope="true"
188 UsePrecompiledHeader="0"
189 WarningLevel="3"
190 WarnAsError="true"
191 Detect64BitPortabilityProblems="false"
192 DebugInformationFormat="3"
193 />
194 <Tool
195 Name="VCManagedResourceCompilerTool"
196 />
197 <Tool
198 Name="VCResourceCompilerTool"
199 />
200 <Tool
201 Name="VCPreLinkEventTool"
202 />
203 <Tool
204 Name="VCLibrarianTool"
205 OutputFile="$(OutDir)/llaudio.lib"
206 />
207 <Tool
208 Name="VCALinkTool"
209 />
210 <Tool
211 Name="VCXDCMakeTool"
212 />
213 <Tool
214 Name="VCBscMakeTool"
215 />
216 <Tool
217 Name="VCFxCopTool"
218 />
219 <Tool
220 Name="VCPostBuildEventTool"
221 />
222 </Configuration>
223 </Configurations>
224 <References>
225 </References>
226 <Files>
227 <Filter
228 Name="Source Files"
229 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
230 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
231 >
232 <File
233 RelativePath=".\audioengine.cpp"
234 >
235 </File>
236 <File
237 RelativePath=".\audioengine_fmod.cpp"
238 >
239 </File>
240 <File
241 RelativePath=".\listener.cpp"
242 >
243 </File>
244 <File
245 RelativePath=".\listener_fmod.cpp"
246 >
247 </File>
248 <File
249 RelativePath=".\llaudiodecodemgr.cpp"
250 >
251 </File>
252 <File
253 RelativePath=".\vorbisdecode.cpp"
254 >
255 </File>
256 <File
257 RelativePath=".\vorbisencode.cpp"
258 >
259 </File>
260 </Filter>
261 <Filter
262 Name="Header Files"
263 Filter="h;hpp;hxx;hm;inl;inc;xsd"
264 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
265 >
266 <File
267 RelativePath=".\audioengine.h"
268 >
269 </File>
270 <File
271 RelativePath=".\audioengine_fmod.h"
272 >
273 </File>
274 <File
275 RelativePath=".\fmod.h"
276 >
277 </File>
278 <File
279 RelativePath=".\fmod_errors.h"
280 >
281 </File>
282 <File
283 RelativePath=".\listener.h"
284 >
285 </File>
286 <File
287 RelativePath=".\listener_ds3d.h"
288 >
289 </File>
290 <File
291 RelativePath=".\listener_fmod.h"
292 >
293 </File>
294 <File
295 RelativePath=".\listener_openal.h"
296 >
297 </File>
298 <File
299 RelativePath=".\llaudiodecodemgr.h"
300 >
301 </File>
302 <File
303 RelativePath=".\vorbisdecode.h"
304 >
305 </File>
306 <File
307 RelativePath=".\vorbisencode.h"
308 >
309 </File>
310 <File
311 RelativePath=".\wavefile.h"
312 >
313 </File>
314 </Filter>
315 <Filter
316 Name="Resource Files"
317 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
318 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
319 >
320 </Filter>
321 </Files>
322 <Globals>
323 </Globals>
324</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index af7ab92..7cd48a9 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -70,7 +70,7 @@ public:
70 LLPointer<LLVorbisDecodeState> mDecoder; 70 LLPointer<LLVorbisDecodeState> mDecoder;
71 }; 71 };
72 72
73 LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename); 73 LLVorbisDecodeState(const LLUUID &uuid, const std::string &out_filename);
74 74
75 BOOL initDecode(); 75 BOOL initDecode();
76 BOOL decodeSection(); // Return TRUE if done. 76 BOOL decodeSection(); // Return TRUE if done.
@@ -93,7 +93,7 @@ protected:
93 93
94 std::vector<U8> mWAVBuffer; 94 std::vector<U8> mWAVBuffer;
95#if !defined(USE_WAV_VFILE) 95#if !defined(USE_WAV_VFILE)
96 LLString mOutFilename; 96 std::string mOutFilename;
97 LLLFSThread::handle_t mFileHandle; 97 LLLFSThread::handle_t mFileHandle;
98#endif 98#endif
99 99
@@ -166,7 +166,7 @@ long vfs_tell (void *datasource)
166 return file->tell(); 166 return file->tell();
167} 167}
168 168
169LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename) 169LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const std::string &out_filename)
170{ 170{
171 mDone = FALSE; 171 mDone = FALSE;
172 mValid = FALSE; 172 mValid = FALSE;
@@ -386,7 +386,7 @@ BOOL LLVorbisDecodeState::finishDecode()
386 mWAVBuffer[7] = (data_length >> 24) & 0x000000FF; 386 mWAVBuffer[7] = (data_length >> 24) & 0x000000FF;
387 387
388 // 388 //
389 // FUCK!!! Vorbis encode/decode messes up loop point transitions (pop) 389 // FUDGECAKES!!! Vorbis encode/decode messes up loop point transitions (pop)
390 // do a cheap-and-cheesy crossfade 390 // do a cheap-and-cheesy crossfade
391 // 391 //
392 { 392 {
@@ -413,12 +413,12 @@ BOOL LLVorbisDecodeState::finishDecode()
413 if((WAV_HEADER_SIZE+(2 * fade_length)) < (S32)mWAVBuffer.size()) 413 if((WAV_HEADER_SIZE+(2 * fade_length)) < (S32)mWAVBuffer.size())
414 { 414 {
415 memcpy(&mWAVBuffer[WAV_HEADER_SIZE], pcmout, (2 * fade_length)); /*Flawfinder: ignore*/ 415 memcpy(&mWAVBuffer[WAV_HEADER_SIZE], pcmout, (2 * fade_length)); /*Flawfinder: ignore*/
416 } 416 }
417 S32 near_end = mWAVBuffer.size() - (2 * fade_length); 417 S32 near_end = mWAVBuffer.size() - (2 * fade_length);
418 if ((S32)mWAVBuffer.size() >= ( near_end + 2* fade_length)) 418 if ((S32)mWAVBuffer.size() >= ( near_end + 2* fade_length))
419 { 419 {
420 memcpy(pcmout, &mWAVBuffer[near_end], (2 * fade_length)); /*Flawfinder: ignore*/ 420 memcpy(pcmout, &mWAVBuffer[near_end], (2 * fade_length)); /*Flawfinder: ignore*/
421 } 421 }
422 llendianswizzle(&pcmout, 2, fade_length); 422 llendianswizzle(&pcmout, 2, fade_length);
423 423
424 samplep = (S16 *)pcmout; 424 samplep = (S16 *)pcmout;
@@ -443,8 +443,8 @@ BOOL LLVorbisDecodeState::finishDecode()
443 } 443 }
444#if !defined(USE_WAV_VFILE) 444#if !defined(USE_WAV_VFILE)
445 mBytesRead = -1; 445 mBytesRead = -1;
446 mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, data_length, 446 mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, mWAVBuffer.size(),
447 new WriteResponder(this)); 447 new WriteResponder(this));
448#endif 448#endif
449 } 449 }
450 450
@@ -583,14 +583,14 @@ void LLAudioDecodeMgr::Impl::processQueue(const F32 num_secs)
583 583
584 lldebugs << "Decoding " << uuid << " from audio queue!" << llendl; 584 lldebugs << "Decoding " << uuid << " from audio queue!" << llendl;
585 585
586 char uuid_str[64]; /*Flawfinder: ignore*/ 586 std::string uuid_str;
587 char d_path[LL_MAX_PATH]; /*Flawfinder: ignore*/ 587 std::string d_path;
588 588
589 LLTimer timer; 589 LLTimer timer;
590 timer.reset(); 590 timer.reset();
591 591
592 uuid.toString(uuid_str); 592 uuid.toString(uuid_str);
593 snprintf(d_path, LL_MAX_PATH, "%s.dsf", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str()); /* Flawfinder: ignore */ 593 d_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + ".dsf";
594 594
595 mCurrentDecodep = new LLVorbisDecodeState(uuid, d_path); 595 mCurrentDecodep = new LLVorbisDecodeState(uuid, d_path);
596 if (!mCurrentDecodep->initDecode()) 596 if (!mCurrentDecodep->initDecode())
diff --git a/linden/indra/llaudio/vorbisencode.cpp b/linden/indra/llaudio/vorbisencode.cpp
index 805e666..3a107b9 100644
--- a/linden/indra/llaudio/vorbisencode.cpp
+++ b/linden/indra/llaudio/vorbisencode.cpp
@@ -70,7 +70,7 @@
70 70
71#endif 71#endif
72 72
73S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg) 73S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& error_msg)
74{ 74{
75 U16 num_channels = 0; 75 U16 num_channels = 0;
76 U32 sample_rate = 0; 76 U32 sample_rate = 0;
@@ -83,12 +83,12 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
83 83
84 unsigned char wav_header[44]; /*Flawfinder: ignore*/ 84 unsigned char wav_header[44]; /*Flawfinder: ignore*/
85 85
86 error_msg[0] = '\0'; 86 error_msg.clear();
87 87
88 apr_file_t* infp = ll_apr_file_open(in_fname,LL_APR_RB); 88 apr_file_t* infp = ll_apr_file_open(in_fname,LL_APR_RB);
89 if (!infp) 89 if (!infp)
90 { 90 {
91 strcpy(error_msg, "CannotUploadSoundFile"); /*Flawfinder: ignore*/ 91 error_msg = "CannotUploadSoundFile";
92 return(LLVORBISENC_SOURCE_OPEN_ERR); 92 return(LLVORBISENC_SOURCE_OPEN_ERR);
93 } 93 }
94 94
@@ -97,14 +97,14 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
97 97
98 if (strncmp((char *)&(wav_header[0]),"RIFF",4)) 98 if (strncmp((char *)&(wav_header[0]),"RIFF",4))
99 { 99 {
100 strcpy(error_msg, "SoundFileNotRIFF"); /*Flawfinder: ignore*/ 100 error_msg = "SoundFileNotRIFF";
101 apr_file_close(infp); 101 apr_file_close(infp);
102 return(LLVORBISENC_WAV_FORMAT_ERR); 102 return(LLVORBISENC_WAV_FORMAT_ERR);
103 } 103 }
104 104
105 if (strncmp((char *)&(wav_header[8]),"WAVE",4)) 105 if (strncmp((char *)&(wav_header[8]),"WAVE",4))
106 { 106 {
107 strcpy(error_msg, "SoundFileNotRIFF"); /*Flawfinder: ignore*/ 107 error_msg = "SoundFileNotRIFF";
108 apr_file_close(infp); 108 apr_file_close(infp);
109 return(LLVORBISENC_WAV_FORMAT_ERR); 109 return(LLVORBISENC_WAV_FORMAT_ERR);
110 } 110 }
@@ -154,31 +154,31 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
154 154
155 if (!uncompressed_pcm) 155 if (!uncompressed_pcm)
156 { 156 {
157 strcpy(error_msg, "SoundFileNotPCM"); /*Flawfinder: ignore*/ 157 error_msg = "SoundFileNotPCM";
158 return(LLVORBISENC_PCM_FORMAT_ERR); 158 return(LLVORBISENC_PCM_FORMAT_ERR);
159 } 159 }
160 160
161 if ((num_channels < 1) || (num_channels > 2)) 161 if ((num_channels < 1) || (num_channels > 2))
162 { 162 {
163 strcpy(error_msg, "SoundFileInvalidChannelCount"); /*Flawfinder: ignore*/ 163 error_msg = "SoundFileInvalidChannelCount";
164 return(LLVORBISENC_MULTICHANNEL_ERR); 164 return(LLVORBISENC_MULTICHANNEL_ERR);
165 } 165 }
166 166
167 if (sample_rate != 44100) 167 if (sample_rate != 44100)
168 { 168 {
169 strcpy(error_msg, "SoundFileInvalidSampleRate"); /*Flawfinder: ignore*/ 169 error_msg = "SoundFileInvalidSampleRate";
170 return(LLVORBISENC_UNSUPPORTED_SAMPLE_RATE); 170 return(LLVORBISENC_UNSUPPORTED_SAMPLE_RATE);
171 } 171 }
172 172
173 if ((bits_per_sample != 16) && (bits_per_sample != 8)) 173 if ((bits_per_sample != 16) && (bits_per_sample != 8))
174 { 174 {
175 strcpy(error_msg, "SoundFileInvalidWordSize"); /*Flawfinder: ignore*/ 175 error_msg = "SoundFileInvalidWordSize";
176 return(LLVORBISENC_UNSUPPORTED_WORD_SIZE); 176 return(LLVORBISENC_UNSUPPORTED_WORD_SIZE);
177 } 177 }
178 178
179 if (!raw_data_length) 179 if (!raw_data_length)
180 { 180 {
181 strcpy(error_msg, "SoundFileInvalidHeader"); /*Flawfinder: ignore*/ 181 error_msg = "SoundFileInvalidHeader";
182 return(LLVORBISENC_CLIP_TOO_LONG); 182 return(LLVORBISENC_CLIP_TOO_LONG);
183 } 183 }
184 184
@@ -186,14 +186,14 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
186 186
187 if (clip_length > 10.0f) 187 if (clip_length > 10.0f)
188 { 188 {
189 strcpy(error_msg, "SoundFileInvalidTooLong"); /*Flawfinder: ignore*/ 189 error_msg = "SoundFileInvalidTooLong";
190 return(LLVORBISENC_CLIP_TOO_LONG); 190 return(LLVORBISENC_CLIP_TOO_LONG);
191 } 191 }
192 192
193 return(LLVORBISENC_NOERR); 193 return(LLVORBISENC_NOERR);
194} 194}
195 195
196S32 encode_vorbis_file(const char *in_fname, const char *out_fname) 196S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname)
197{ 197{
198#define READ_BUFFER 1024 198#define READ_BUFFER 1024
199 unsigned char readbuffer[READ_BUFFER*4+44]; /* out of the data segment, not the stack */ /*Flawfinder: ignore*/ 199 unsigned char readbuffer[READ_BUFFER*4+44]; /* out of the data segment, not the stack */ /*Flawfinder: ignore*/
@@ -216,7 +216,7 @@ S32 encode_vorbis_file(const char *in_fname, const char *out_fname)
216 U32 bits_per_sample = 0; 216 U32 bits_per_sample = 0;
217 217
218 S32 format_error = 0; 218 S32 format_error = 0;
219 char error_msg[MAX_STRING]; /*Flawfinder: ignore*/ 219 std::string error_msg;
220 if ((format_error = check_for_invalid_wav_formats(in_fname, error_msg))) 220 if ((format_error = check_for_invalid_wav_formats(in_fname, error_msg)))
221 { 221 {
222 llwarns << error_msg << ": " << in_fname << llendl; 222 llwarns << error_msg << ": " << in_fname << llendl;
diff --git a/linden/indra/llaudio/vorbisencode.h b/linden/indra/llaudio/vorbisencode.h
index 2dae529..6ad0819 100644
--- a/linden/indra/llaudio/vorbisencode.h
+++ b/linden/indra/llaudio/vorbisencode.h
@@ -45,8 +45,8 @@ const S32 LLVORBISENC_UNSUPPORTED_WORD_SIZE = 9; // unsupported word size
45const S32 LLVORBISENC_CLIP_TOO_LONG = 10; // source file is too long 45const S32 LLVORBISENC_CLIP_TOO_LONG = 10; // source file is too long
46 46
47 47
48S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg); 48S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& error_msg);
49S32 encode_vorbis_file(const char *in_fname, const char *out_fname); 49S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname);
50 50
51#endif 51#endif
52 52
generated by cgit v1.1 at 2025-03-28 05:57:53 +0000