Merge pull request #176 from Xottab-DUTY/xrSound

Small xrSound improvements
OpenXRay · Mar 17, 2017 · 792fbf7 · 792fbf7
2 parents 3b50a64 + 1b5ce50
commit 792fbf7
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 41 deletions.
diff --git a/src/xrSound/SoundRender.h b/src/xrSound/SoundRender.h
@@ -2,7 +2,7 @@
 #define SoundRenderH
 #pragma once
 
-#include "sound.h"
+#include "Sound.h"
 
 class CSoundRender_Core;
 class CSoundRender_Source;

diff --git a/src/xrSound/SoundRender_Cache.cpp b/src/xrSound/SoundRender_Cache.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include ".\soundrender_cache.h"
+#include "SoundRender_Cache.h"
 
 CSoundRender_Cache::CSoundRender_Cache()
 {
@@ -80,7 +80,7 @@ BOOL CSoundRender_Cache::request(cache_cat& cat, u32 id)
 
 void CSoundRender_Cache::initialize(u32 _total_kb_approx, u32 bytes_per_line)
 {
-    // use twice the requisted memory (to avoid bad configs)
+    // use twice the requested memory (to avoid bad configs)
     _total_kb_approx *= 2;
 
     // calc

diff --git a/src/xrSound/SoundRender_Core.cpp b/src/xrSound/SoundRender_Core.cpp
@@ -2,9 +2,9 @@
 #pragma hdrstop
 
 #include "Common/LevelStructure.hpp"
-#include "soundrender_core.h"
-#include "soundrender_source.h"
-#include "soundrender_emitter.h"
+#include "SoundRender_Core.h"
+#include "SoundRender_Source.h"
+#include "SoundRender_Emitter.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <eax/eax.h>

diff --git a/src/xrSound/SoundRender_CoreA.cpp b/src/xrSound/SoundRender_CoreA.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender_coreA.h"
-#include "soundrender_targetA.h"
+#include "SoundRender_CoreA.h"
+#include "SoundRender_TargetA.h"
 
 CSoundRender_CoreA* SoundRenderA = 0;
 

diff --git a/src/xrSound/SoundRender_Emitter.cpp b/src/xrSound/SoundRender_Emitter.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender_emitter.h"
-#include "soundrender_core.h"
-#include "soundrender_source.h"
-#include "soundrender_targetA.h"
+#include "SoundRender_Emitter.h"
+#include "SoundRender_Core.h"
+#include "SoundRender_Source.h"
+#include "SoundRender_TargetA.h"
 
 extern u32 psSoundModel;
 extern float psSoundVEffects;

diff --git a/src/xrSound/SoundRender_Emitter.h b/src/xrSound/SoundRender_Emitter.h
@@ -2,8 +2,8 @@
 #define SoundRender_EmitterH
 #pragma once
 
-#include "soundrender.h"
-#include "soundrender_environment.h"
+#include "SoundRender.h"
+#include "SoundRender_Environment.h"
 
 class CSoundRender_Emitter : public CSound_emitter
 {

diff --git a/src/xrSound/SoundRender_Environment.cpp b/src/xrSound/SoundRender_Environment.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender.h"
-#include "soundrender_environment.h"
+#include "SoundRender.h"
+#include "SoundRender_Environment.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <eax/eax.h>

diff --git a/src/xrSound/SoundRender_Source.cpp b/src/xrSound/SoundRender_Source.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender_core.h"
-#include "soundrender_source.h"
+#include "SoundRender_Core.h"
+#include "SoundRender_Source.h"
 
 CSoundRender_Source::CSoundRender_Source()
 {

diff --git a/src/xrSound/SoundRender_Source.h b/src/xrSound/SoundRender_Source.h
@@ -2,7 +2,7 @@
 #define SoundRender_SourceH
 #pragma once
 
-#include "soundrender_cache.h"
+#include "SoundRender_Cache.h"
 
 // refs
 struct OggVorbis_File;

diff --git a/src/xrSound/SoundRender_Source_loader.cpp b/src/xrSound/SoundRender_Source_loader.cpp
@@ -3,8 +3,8 @@
 
 #include <msacm.h>
 
-#include "soundrender_core.h"
-#include "soundrender_source.h"
+#include "SoundRender_Core.h"
+#include "SoundRender_Source.h"
 
 //	SEEK_SET	0	File beginning
 //	SEEK_CUR	1	Current file pointer position

diff --git a/src/xrSound/SoundRender_Target.cpp b/src/xrSound/SoundRender_Target.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender_target.h"
-#include "soundrender_core.h"
-#include "soundrender_emitter.h"
-#include "soundrender_source.h"
+#include "SoundRender_Target.h"
+#include "SoundRender_Core.h"
+#include "SoundRender_Emitter.h"
+#include "SoundRender_Source.h"
 
 CSoundRender_Target::CSoundRender_Target(void)
 {

diff --git a/src/xrSound/SoundRender_Target.h b/src/xrSound/SoundRender_Target.h
@@ -2,7 +2,7 @@
 #define SoundRender_TargetH
 #pragma once
 
-#include "soundrender.h"
+#include "SoundRender.h"
 
 class CSoundRender_Target
 {

diff --git a/src/xrSound/SoundRender_TargetA.cpp b/src/xrSound/SoundRender_TargetA.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "soundrender_TargetA.h"
-#include "soundrender_emitter.h"
-#include "soundrender_source.h"
+#include "SoundRender_TargetA.h"
+#include "SoundRender_Emitter.h"
+#include "SoundRender_Source.h"
 
 xr_vector<u8> g_target_temp_data;
 

diff --git a/src/xrSound/SoundRender_TargetA.h b/src/xrSound/SoundRender_TargetA.h
@@ -2,8 +2,8 @@
 #define SoundRender_TargetAH
 #pragma once
 
-#include "soundrender_Target.h"
-#include "soundrender_CoreA.h"
+#include "Soundrender_Target.h"
+#include "Soundrender_CoreA.h"
 
 class CSoundRender_TargetA : public CSoundRender_Target
 {

diff --git a/src/xrSound/stdafx.cpp b/src/xrSound/stdafx.cpp
@@ -14,11 +14,5 @@
 #pragma comment(lib, "EToolsB.lib")
 #pragma comment(lib, "OpenAL32B.lib")
 #pragma comment(lib, "dsoundb.lib")
-//#	pragma comment(lib,	"xrapi.lib" 		)
-#else
-#pragma comment(lib, "eax.lib")
-#pragma comment(lib, "xrCore.lib")
-#pragma comment(lib, "xrCDB.lib")
-#pragma comment(lib, "dsound.lib")
-#pragma comment(lib, "xrapi.lib")
+//#pragma comment(lib, "xrAPI.lib")
 #endif
diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj
@@ -88,7 +88,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MapExports>false</MapExports>
@@ -121,7 +121,7 @@
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -153,7 +153,7 @@
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <LargeAddressAware>true</LargeAddressAware>