AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the SOFT moniker for the loopback extension functions and enums

Browse Source
This commit is contained in:
Chris Robinson 2011-04-28 11:37:23 -07:00
parent 2e9ca89dd3
commit 63f07db303
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Alc/ALc.c
View File

@ -130,9 +130,9 @@ static const ALCfunction alcFunctions[] = {
{ "alcSetThreadContext", (ALCvoid *) alcSetThreadContext }, { "alcSetThreadContext", (ALCvoid *) alcSetThreadContext },
{ "alcGetThreadContext", (ALCvoid *) alcGetThreadContext }, { "alcGetThreadContext", (ALCvoid *) alcGetThreadContext },
{ "alcLoopbackOpenDevice", (ALCvoid *) alcLoopbackOpenDevice }, { "alcLoopbackOpenDeviceSOFT", (ALCvoid *) alcLoopbackOpenDeviceSOFT},
{ "alcIsRenderFormatSupported", (ALCvoid *) alcIsRenderFormatSupported}, { "alcIsRenderFormatSupportedSOFT",(ALCvoid *) alcIsRenderFormatSupportedSOFT},
{ "alcRenderSamples", (ALCvoid *) alcRenderSamples }, { "alcRenderSamplesSOFT", (ALCvoid *) alcRenderSamplesSOFT },
{ "alEnable", (ALCvoid *) alEnable }, { "alEnable", (ALCvoid *) alEnable },
{ "alDisable", (ALCvoid *) alDisable }, { "alDisable", (ALCvoid *) alDisable },
@ -305,8 +305,8 @@ static const ALCenums enumeration[] = {
{ "ALC_MAX_AUXILIARY_SENDS", ALC_MAX_AUXILIARY_SENDS }, { "ALC_MAX_AUXILIARY_SENDS", ALC_MAX_AUXILIARY_SENDS },
// Loopback device Properties // Loopback device Properties
{ "ALC_FORMAT_CHANNELS", ALC_FORMAT_CHANNELS }, { "ALC_FORMAT_CHANNELS_SOFT", ALC_FORMAT_CHANNELS_SOFT },
{ "ALC_FORMAT_TYPE", ALC_FORMAT_TYPE }, { "ALC_FORMAT_TYPE_SOFT", ALC_FORMAT_TYPE_SOFT },
// ALC Error Message // ALC Error Message
{ "ALC_NO_ERROR", ALC_NO_ERROR }, { "ALC_NO_ERROR", ALC_NO_ERROR },
@ -1062,7 +1062,7 @@ static ALCboolean UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
attrIdx = 0; attrIdx = 0;
while(attrList[attrIdx]) while(attrList[attrIdx])
{ {
if(attrList[attrIdx] == ALC_FORMAT_CHANNELS && if(attrList[attrIdx] == ALC_FORMAT_CHANNELS_SOFT &&
device->IsLoopbackDevice) device->IsLoopbackDevice)
{ {
ALCint val = attrList[attrIdx + 1]; ALCint val = attrList[attrIdx + 1];
@ -1074,7 +1074,7 @@ static ALCboolean UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
schans = val; schans = val;
} }
if(attrList[attrIdx] == ALC_FORMAT_TYPE && if(attrList[attrIdx] == ALC_FORMAT_TYPE_SOFT &&
device->IsLoopbackDevice) device->IsLoopbackDevice)
{ {
ALCint val = attrList[attrIdx + 1]; ALCint val = attrList[attrIdx + 1];
@ -1711,10 +1711,10 @@ ALC_API ALCvoid ALC_APIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsi
} }
else else
{ {
data[i++] = ALC_FORMAT_CHANNELS; data[i++] = ALC_FORMAT_CHANNELS_SOFT;
data[i++] = device->FmtChans; data[i++] = device->FmtChans;
data[i++] = ALC_FORMAT_TYPE; data[i++] = ALC_FORMAT_TYPE_SOFT;
data[i++] = device->FmtType; data[i++] = device->FmtType;
} }
@ -1753,14 +1753,14 @@ ALC_API ALCvoid ALC_APIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsi
*data = ALC_FALSE; *data = ALC_FALSE;
break; break;
case ALC_FORMAT_CHANNELS: case ALC_FORMAT_CHANNELS_SOFT:
if(!IsDevice(device) || !device->IsLoopbackDevice) if(!IsDevice(device) || !device->IsLoopbackDevice)
alcSetError(device, ALC_INVALID_DEVICE); alcSetError(device, ALC_INVALID_DEVICE);
else else
*data = device->FmtChans; *data = device->FmtChans;
break; break;
case ALC_FORMAT_TYPE: case ALC_FORMAT_TYPE_SOFT:
if(!IsDevice(device) || !device->IsLoopbackDevice) if(!IsDevice(device) || !device->IsLoopbackDevice)
alcSetError(device, ALC_INVALID_DEVICE); alcSetError(device, ALC_INVALID_DEVICE);
else else
@ -2451,7 +2451,7 @@ ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *pDevice)
} }
ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDevice(void) ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(void)
{ {
ALCdevice *device; ALCdevice *device;
@ -2521,7 +2521,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDevice(void)
return device; return device;
} }
ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupported(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type) ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type)
{ {
ALCboolean ret = ALC_FALSE; ALCboolean ret = ALC_FALSE;
@ -2548,7 +2548,7 @@ ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupported(ALCdevice *device, AL
return ret; return ret;
} }
ALC_API void ALC_APIENTRY alcRenderSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples)
{ {
SuspendContext(NULL); SuspendContext(NULL);
if(!IsDevice(device) || !device->IsLoopbackDevice) if(!IsDevice(device) || !device->IsLoopbackDevice)

16
OpenAL32/Include/alMain.h
View File

@ -61,15 +61,15 @@
#ifndef ALC_SOFT_device_loopback #ifndef ALC_SOFT_device_loopback
#define ALC_SOFT_device_loopback 1 #define ALC_SOFT_device_loopback 1
#define ALC_FORMAT_CHANNELS 0x1990 #define ALC_FORMAT_CHANNELS_SOFT 0x1990
#define ALC_FORMAT_TYPE 0x1991 #define ALC_FORMAT_TYPE_SOFT 0x1991
typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICE)(void); typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(void);
typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTED)(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type); typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type);
typedef void (ALC_APIENTRY*LPALCRENDERSAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
#ifdef AL_ALEXT_PROTOTYPES #ifdef AL_ALEXT_PROTOTYPES
ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDevice(void); ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(void);
ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupported(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type); ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALenum channels, ALenum type);
ALC_API void ALC_APIENTRY alcRenderSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
#endif #endif
#endif #endif