aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALc.c38
-rw-r--r--Alc/backends/alsa.c2
-rw-r--r--Alc/backends/coreaudio.c2
-rw-r--r--Alc/backends/dsound.c2
-rw-r--r--Alc/backends/mmdevapi.c2
-rw-r--r--Alc/backends/null.c2
-rw-r--r--Alc/backends/opensl.c2
-rw-r--r--Alc/backends/oss.c2
-rw-r--r--Alc/backends/portaudio.c2
-rw-r--r--Alc/backends/pulseaudio.c2
-rw-r--r--Alc/backends/sndio.c2
-rw-r--r--Alc/backends/solaris.c2
-rw-r--r--Alc/backends/wave.c2
-rw-r--r--Alc/backends/winmm.c2
-rw-r--r--OpenAL32/Include/alMain.h2
15 files changed, 33 insertions, 33 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index c57d015d..2c1076bb 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -588,14 +588,14 @@ static const ALCchar alcErrOutOfMemory[] = "Out of Memory";
/* Enumerated device names */
static const ALCchar alcDefaultName[] = "OpenAL Soft\0";
-static ALCchar *alcAllDeviceList;
+static ALCchar *alcAllDevicesList;
static ALCchar *alcCaptureDeviceList;
/* Sizes only include the first ending null character, not the second */
-static size_t alcAllDeviceListSize;
+static size_t alcAllDevicesListSize;
static size_t alcCaptureDeviceListSize;
/* Default is always the first in the list */
-static ALCchar *alcDefaultAllDeviceSpecifier;
+static ALCchar *alcDefaultAllDevicesSpecifier;
static ALCchar *alcCaptureDefaultDeviceSpecifier;
/* Default context extensions */
@@ -964,13 +964,13 @@ static void alc_cleanup(void)
{
ALCdevice *dev;
- free(alcAllDeviceList); alcAllDeviceList = NULL;
- alcAllDeviceListSize = 0;
+ free(alcAllDevicesList); alcAllDevicesList = NULL;
+ alcAllDevicesListSize = 0;
free(alcCaptureDeviceList); alcCaptureDeviceList = NULL;
alcCaptureDeviceListSize = 0;
- free(alcDefaultAllDeviceSpecifier);
- alcDefaultAllDeviceSpecifier = NULL;
+ free(alcDefaultAllDevicesSpecifier);
+ alcDefaultAllDevicesSpecifier = NULL;
free(alcCaptureDefaultDeviceSpecifier);
alcCaptureDefaultDeviceSpecifier = NULL;
@@ -1036,8 +1036,8 @@ static void ProbeList(ALCchar **list, size_t *listsize, enum DevProbe type)
UnlockLists();
}
-static void ProbeAllDeviceList(void)
-{ ProbeList(&alcAllDeviceList, &alcAllDeviceListSize, ALL_DEVICE_PROBE); }
+static void ProbeAllDevicesList(void)
+{ ProbeList(&alcAllDevicesList, &alcAllDevicesListSize, ALL_DEVICE_PROBE); }
static void ProbeCaptureDeviceList(void)
{ ProbeList(&alcCaptureDeviceList, &alcCaptureDeviceListSize, CAPTURE_DEVICE_PROBE); }
@@ -1067,7 +1067,7 @@ static void AppendList(const ALCchar *name, ALCchar **List, size_t *ListSize)
void Append##type##List(const ALCchar *name) \
{ AppendList(name, &alc##type##List, &alc##type##ListSize); }
-DECL_APPEND_LIST_FUNC(AllDevice)
+DECL_APPEND_LIST_FUNC(AllDevices)
DECL_APPEND_LIST_FUNC(CaptureDevice)
#undef DECL_APPEND_LIST_FUNC
@@ -2004,8 +2004,8 @@ ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *Device, ALCenum para
}
else
{
- ProbeAllDeviceList();
- value = alcAllDeviceList;
+ ProbeAllDevicesList();
+ value = alcAllDevicesList;
}
break;
@@ -2028,18 +2028,18 @@ ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *Device, ALCenum para
break;
case ALC_DEFAULT_ALL_DEVICES_SPECIFIER:
- if(!alcAllDeviceList)
- ProbeAllDeviceList();
+ if(!alcAllDevicesList)
+ ProbeAllDevicesList();
Device = VerifyDevice(Device);
- free(alcDefaultAllDeviceSpecifier);
- alcDefaultAllDeviceSpecifier = strdup(alcAllDeviceList ?
- alcAllDeviceList : "");
- if(!alcDefaultAllDeviceSpecifier)
+ free(alcDefaultAllDevicesSpecifier);
+ alcDefaultAllDevicesSpecifier = strdup(alcAllDevicesList ?
+ alcAllDevicesList : "");
+ if(!alcDefaultAllDevicesSpecifier)
alcSetError(Device, ALC_OUT_OF_MEMORY);
- value = alcDefaultAllDeviceSpecifier;
+ value = alcDefaultAllDevicesSpecifier;
if(Device) ALCdevice_DecRef(Device);
break;
diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c
index 6aa79a75..3cb96327 100644
--- a/Alc/backends/alsa.c
+++ b/Alc/backends/alsa.c
@@ -1311,7 +1311,7 @@ void alc_alsa_probe(enum DevProbe type)
allDevNameMap = probe_devices(SND_PCM_STREAM_PLAYBACK, &numDevNames);
for(i = 0;i < numDevNames;++i)
- AppendAllDeviceList(allDevNameMap[i].name);
+ AppendAllDevicesList(allDevNameMap[i].name);
break;
case CAPTURE_DEVICE_PROBE:
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c
index 8f9434ca..a4f72468 100644
--- a/Alc/backends/coreaudio.c
+++ b/Alc/backends/coreaudio.c
@@ -692,7 +692,7 @@ void alc_ca_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(ca_device);
+ AppendAllDevicesList(ca_device);
break;
case CAPTURE_DEVICE_PROBE:
AppendCaptureDeviceList(ca_device);
diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c
index 23d91b69..919160e9 100644
--- a/Alc/backends/dsound.c
+++ b/Alc/backends/dsound.c
@@ -995,7 +995,7 @@ void alcDSoundProbe(enum DevProbe type)
else
{
for(i = 0;i < NumPlaybackDevices;i++)
- AppendAllDeviceList(PlaybackDeviceList[i].name);
+ AppendAllDevicesList(PlaybackDeviceList[i].name);
}
break;
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index 1f4dbbc9..36a11e2d 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -1007,7 +1007,7 @@ void alcMMDevApiProbe(enum DevProbe type)
for(i = 0;i < NumPlaybackDevices;i++)
{
if(PlaybackDeviceList[i].name)
- AppendAllDeviceList(PlaybackDeviceList[i].name);
+ AppendAllDevicesList(PlaybackDeviceList[i].name);
}
}
break;
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index cd0f935c..1b9bedef 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -158,7 +158,7 @@ void alc_null_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(nullDevice);
+ AppendAllDevicesList(nullDevice);
break;
case CAPTURE_DEVICE_PROBE:
break;
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c
index 1240b2e8..bf243e38 100644
--- a/Alc/backends/opensl.c
+++ b/Alc/backends/opensl.c
@@ -431,7 +431,7 @@ void alc_opensl_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(opensl_device);
+ AppendAllDevicesList(opensl_device);
break;
case CAPTURE_DEVICE_PROBE:
break;
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c
index 3c7ace1e..365bb802 100644
--- a/Alc/backends/oss.c
+++ b/Alc/backends/oss.c
@@ -513,7 +513,7 @@ void alc_oss_probe(enum DevProbe type)
struct stat buf;
if(stat(oss_driver, &buf) == 0)
#endif
- AppendAllDeviceList(oss_device);
+ AppendAllDevicesList(oss_device);
}
break;
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index 13c83cef..b9998150 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -460,7 +460,7 @@ void alc_pa_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(pa_device);
+ AppendAllDevicesList(pa_device);
break;
case CAPTURE_DEVICE_PROBE:
AppendCaptureDeviceList(pa_device);
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c
index e40419e3..a88321f7 100644
--- a/Alc/backends/pulseaudio.c
+++ b/Alc/backends/pulseaudio.c
@@ -1457,7 +1457,7 @@ void alc_pulse_probe(enum DevProbe type)
probe_devices(AL_FALSE);
for(i = 0;i < numDevNames;i++)
- AppendAllDeviceList(allDevNameMap[i].name);
+ AppendAllDevicesList(allDevNameMap[i].name);
break;
case CAPTURE_DEVICE_PROBE:
diff --git a/Alc/backends/sndio.c b/Alc/backends/sndio.c
index a4b0bcd6..18636786 100644
--- a/Alc/backends/sndio.c
+++ b/Alc/backends/sndio.c
@@ -364,7 +364,7 @@ void alc_sndio_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(sndio_device);
+ AppendAllDevicesList(sndio_device);
break;
case CAPTURE_DEVICE_PROBE:
break;
diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c
index 7f456609..215e7209 100644
--- a/Alc/backends/solaris.c
+++ b/Alc/backends/solaris.c
@@ -272,7 +272,7 @@ void alc_solaris_probe(enum DevProbe type)
struct stat buf;
if(stat(solaris_driver, &buf) == 0)
#endif
- AppendAllDeviceList(solaris_device);
+ AppendAllDevicesList(solaris_device);
}
break;
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index 1df07078..156bfd2d 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -350,7 +350,7 @@ void alc_wave_probe(enum DevProbe type)
switch(type)
{
case ALL_DEVICE_PROBE:
- AppendAllDeviceList(waveDevice);
+ AppendAllDevicesList(waveDevice);
break;
case CAPTURE_DEVICE_PROBE:
break;
diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
index 9669a20d..b7c637d6 100644
--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
@@ -756,7 +756,7 @@ void alcWinMMProbe(enum DevProbe type)
for(i = 0;i < NumPlaybackDevices;i++)
{
if(PlaybackDeviceList[i])
- AppendAllDeviceList(PlaybackDeviceList[i]);
+ AppendAllDevicesList(PlaybackDeviceList[i]);
}
break;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 76a0bfbc..85d8a0b1 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -671,7 +671,7 @@ ALCcontext *GetContextRef(void);
void ALCcontext_IncRef(ALCcontext *context);
void ALCcontext_DecRef(ALCcontext *context);
-void AppendAllDeviceList(const ALCchar *name);
+void AppendAllDevicesList(const ALCchar *name);
void AppendCaptureDeviceList(const ALCchar *name);
static __inline void LockDevice(ALCdevice *device)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 13:00:01 +0000