a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 04:40:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into opus

Browse source
This commit is contained in:
Sergeanur 2020-05-24 01:07:03 +03:00
parent 3a7651e7ab 7d30878418
commit 0c4ce002f1
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
premake5.lua
View file

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

3
src/audio/oal/aldlist.cpp
View file

@ -35,7 +35,6 @@
*/ */
ALDeviceList::ALDeviceList() ALDeviceList::ALDeviceList()
{ {
ALDEVICEINFO ALDeviceInfo;
char *devices; char *devices;
int index; int index;
const char *defaultDeviceName; const char *defaultDeviceName;
@ -71,7 +70,7 @@ ALDeviceList::ALDeviceList()
} }
} }
if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) { if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) {
memset(&ALDeviceInfo, 0, sizeof(ALDEVICEINFO)); ALDEVICEINFO ALDeviceInfo;
ALDeviceInfo.bSelected = true; ALDeviceInfo.bSelected = true;
ALDeviceInfo.strDeviceName = actualDeviceName; ALDeviceInfo.strDeviceName = actualDeviceName;
alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion); alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion);

11
src/audio/oal/aldlist.h
View file

@ -8,15 +8,20 @@
#include <vector> #include <vector>
#include <string> #include <string>
typedef struct struct ALDEVICEINFO {
{
std::string strDeviceName; std::string strDeviceName;
int iMajorVersion; int iMajorVersion;
int iMinorVersion; int iMinorVersion;
unsigned int uiSourceCount; unsigned int uiSourceCount;
std::vector<std::string> *pvstrExtensions; std::vector<std::string> *pvstrExtensions;
bool bSelected; bool bSelected;
} ALDEVICEINFO, *LPALDEVICEINFO;
ALDEVICEINFO() : iMajorVersion(0), iMinorVersion(0), uiSourceCount(0), pvstrExtensions(NULL), bSelected(false)
{
}
};
typedef ALDEVICEINFO *LPALDEVICEINFO;
class ALDeviceList class ALDeviceList
{ {

2
src/audio/sampman.h
View file

@ -3,7 +3,7 @@
#include "AudioSamples.h" #include "AudioSamples.h"
#define MAX_VOLUME 127 #define MAX_VOLUME 127
#define MAX_FREQ 22050 #define MAX_FREQ DIGITALRATE
struct tSample { struct tSample {
int32 nOffset; int32 nOffset;