summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-24 00:06:19 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-24 00:06:19 +0200
commit7d30878418e037bcfda4121f59193e25a89c1824 (patch)
tree96fd3b0496898b09b0899e1cb9f40bab627906b7
parentEven more small audio cleanup (diff)
downloadre3-7d30878418e037bcfda4121f59193e25a89c1824.tar
re3-7d30878418e037bcfda4121f59193e25a89c1824.tar.gz
re3-7d30878418e037bcfda4121f59193e25a89c1824.tar.bz2
re3-7d30878418e037bcfda4121f59193e25a89c1824.tar.lz
re3-7d30878418e037bcfda4121f59193e25a89c1824.tar.xz
re3-7d30878418e037bcfda4121f59193e25a89c1824.tar.zst
re3-7d30878418e037bcfda4121f59193e25a89c1824.zip
-rw-r--r--premake5.lua2
-rw-r--r--src/audio/oal/aldlist.cpp3
-rw-r--r--src/audio/oal/aldlist.h11
-rw-r--r--src/audio/sampman.h2
4 files changed, 10 insertions, 8 deletions
diff --git a/premake5.lua b/premake5.lua
index fd6da6ac..2331c0b3 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -185,8 +185,6 @@ project "re3"
includedirs { "src/weapons" }
includedirs { "src/extras" }
includedirs { "eax" }
-
- includedirs { "eax" }
filter "platforms:*mss"
defines { "AUDIO_MSS" }
diff --git a/src/audio/oal/aldlist.cpp b/src/audio/oal/aldlist.cpp
index 7401e036..9834ffb4 100644
--- a/src/audio/oal/aldlist.cpp
+++ b/src/audio/oal/aldlist.cpp
@@ -35,7 +35,6 @@
*/
ALDeviceList::ALDeviceList()
{
- ALDEVICEINFO ALDeviceInfo;
char *devices;
int index;
const char *defaultDeviceName;
@@ -71,7 +70,7 @@ ALDeviceList::ALDeviceList()
}
}
if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) {
- memset(&ALDeviceInfo, 0, sizeof(ALDEVICEINFO));
+ ALDEVICEINFO ALDeviceInfo;
ALDeviceInfo.bSelected = true;
ALDeviceInfo.strDeviceName = actualDeviceName;
alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion);
diff --git a/src/audio/oal/aldlist.h b/src/audio/oal/aldlist.h
index 694c9d01..3afa6bfe 100644
--- a/src/audio/oal/aldlist.h
+++ b/src/audio/oal/aldlist.h
@@ -8,15 +8,20 @@
#include <vector>
#include <string>
-typedef struct
-{
+struct ALDEVICEINFO {
std::string strDeviceName;
int iMajorVersion;
int iMinorVersion;
unsigned int uiSourceCount;
std::vector<std::string> *pvstrExtensions;
bool bSelected;
-} ALDEVICEINFO, *LPALDEVICEINFO;
+
+ ALDEVICEINFO() : iMajorVersion(0), iMinorVersion(0), uiSourceCount(0), pvstrExtensions(NULL), bSelected(false)
+ {
+ }
+};
+
+typedef ALDEVICEINFO *LPALDEVICEINFO;
class ALDeviceList
{
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index d3c82943..621d4015 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -3,7 +3,7 @@
#include "AudioSamples.h"
#define MAX_VOLUME 127
-#define MAX_FREQ 22050
+#define MAX_FREQ DIGITALRATE
struct tSample {
int32 nOffset;