Merge branch 'master' into opus

premake5.lua

@@ -191,8 +191,6 @@ project "re3"
 	includedirs { "src/extras" }
 	includedirs { "eax" }
 	
-	includedirs { "eax" }
-	
 	if _OPTIONS["with-opus"] then
 		includedirs { "ogg/include" }
 		includedirs { "opus/include" }

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);

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
 {

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;