aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-03-19 00:24:54 -0700
committerChris Robinson <[email protected]>2019-03-19 00:24:54 -0700
commit9695952c8d45245c3f1dbbfd9a363403bd5dd6aa (patch)
treedaa5c61e7ad0d72ad5a2184c54a7aa88b66688d0 /Alc
parentd31514f8beff74d4425a7dd7bcc2084023a3ffdd (diff)
Rename DevProbe enum names
Diffstat (limited to 'Alc')
-rw-r--r--Alc/alc.cpp4
-rw-r--r--Alc/backends/alsa.cpp4
-rw-r--r--Alc/backends/coreaudio.cpp4
-rw-r--r--Alc/backends/dsound.cpp4
-rw-r--r--Alc/backends/jack.cpp4
-rw-r--r--Alc/backends/null.cpp4
-rw-r--r--Alc/backends/opensl.cpp4
-rw-r--r--Alc/backends/oss.cpp4
-rw-r--r--Alc/backends/portaudio.cpp4
-rw-r--r--Alc/backends/pulseaudio.cpp4
-rw-r--r--Alc/backends/qsa.cpp4
-rw-r--r--Alc/backends/sdl2.cpp2
-rw-r--r--Alc/backends/sndio.cpp4
-rw-r--r--Alc/backends/solaris.cpp4
-rw-r--r--Alc/backends/wasapi.cpp12
-rw-r--r--Alc/backends/wave.cpp4
-rw-r--r--Alc/backends/winmm.cpp4
17 files changed, 37 insertions, 37 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index 6e6bc2b4..b7b35c52 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -1178,9 +1178,9 @@ static void ProbeDevices(std::string *list, BackendInfo *backendinfo, DevProbe t
backendinfo->getFactory().probe(type, list);
}
static void ProbeAllDevicesList(void)
-{ ProbeDevices(&alcAllDevicesList, &PlaybackBackend, ALL_DEVICE_PROBE); }
+{ ProbeDevices(&alcAllDevicesList, &PlaybackBackend, DevProbe::Playback); }
static void ProbeCaptureDeviceList(void)
-{ ProbeDevices(&alcCaptureDeviceList, &CaptureBackend, CAPTURE_DEVICE_PROBE); }
+{ ProbeDevices(&alcCaptureDeviceList, &CaptureBackend, DevProbe::Capture); }
/************************************************
diff --git a/Alc/backends/alsa.cpp b/Alc/backends/alsa.cpp
index ef5d6f7c..1a287565 100644
--- a/Alc/backends/alsa.cpp
+++ b/Alc/backends/alsa.cpp
@@ -1277,12 +1277,12 @@ void AlsaBackendFactory::probe(DevProbe type, std::string *outnames)
};
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
PlaybackDevices = probe_devices(SND_PCM_STREAM_PLAYBACK);
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
CaptureDevices = probe_devices(SND_PCM_STREAM_CAPTURE);
std::for_each(CaptureDevices.cbegin(), CaptureDevices.cend(), add_device);
break;
diff --git a/Alc/backends/coreaudio.cpp b/Alc/backends/coreaudio.cpp
index 432733f4..ce4bf600 100644
--- a/Alc/backends/coreaudio.cpp
+++ b/Alc/backends/coreaudio.cpp
@@ -694,8 +694,8 @@ void CoreAudioBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Playback:
+ case DevProbe::Capture:
/* Includes null char. */
outnames->append(ca_device, sizeof(ca_device));
break;
diff --git a/Alc/backends/dsound.cpp b/Alc/backends/dsound.cpp
index 6de108cd..8b181d0d 100644
--- a/Alc/backends/dsound.cpp
+++ b/Alc/backends/dsound.cpp
@@ -924,7 +924,7 @@ void DSoundBackendFactory::probe(DevProbe type, std::string *outnames)
HRESULT hrcom{CoInitialize(nullptr)};
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
PlaybackDevices.clear();
hr = DirectSoundEnumerateW(DSoundEnumDevices, &PlaybackDevices);
if(FAILED(hr))
@@ -932,7 +932,7 @@ void DSoundBackendFactory::probe(DevProbe type, std::string *outnames)
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
CaptureDevices.clear();
hr = DirectSoundCaptureEnumerateW(DSoundEnumDevices, &CaptureDevices);
if(FAILED(hr))
diff --git a/Alc/backends/jack.cpp b/Alc/backends/jack.cpp
index c079bb19..9fc5ac4a 100644
--- a/Alc/backends/jack.cpp
+++ b/Alc/backends/jack.cpp
@@ -548,12 +548,12 @@ void JackBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
/* Includes null char. */
outnames->append(jackDevice, sizeof(jackDevice));
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
break;
}
}
diff --git a/Alc/backends/null.cpp b/Alc/backends/null.cpp
index 8bd84656..07907dec 100644
--- a/Alc/backends/null.cpp
+++ b/Alc/backends/null.cpp
@@ -161,11 +161,11 @@ void NullBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
/* Includes null char. */
outnames->append(nullDevice, sizeof(nullDevice));
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
break;
}
}
diff --git a/Alc/backends/opensl.cpp b/Alc/backends/opensl.cpp
index ce67bd64..e3360362 100644
--- a/Alc/backends/opensl.cpp
+++ b/Alc/backends/opensl.cpp
@@ -926,8 +926,8 @@ void OSLBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Playback:
+ case DevProbe::Capture:
/* Includes null char. */
outnames->append(opensl_device, sizeof(opensl_device));
break;
diff --git a/Alc/backends/oss.cpp b/Alc/backends/oss.cpp
index 3634cce9..09a170e4 100644
--- a/Alc/backends/oss.cpp
+++ b/Alc/backends/oss.cpp
@@ -734,13 +734,13 @@ void OSSBackendFactory::probe(DevProbe type, std::string *outnames)
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
PlaybackDevices.clear();
ALCossListPopulate(&PlaybackDevices, DSP_CAP_OUTPUT);
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
CaptureDevices.clear();
ALCossListPopulate(&CaptureDevices, DSP_CAP_INPUT);
std::for_each(CaptureDevices.cbegin(), CaptureDevices.cend(), add_device);
diff --git a/Alc/backends/portaudio.cpp b/Alc/backends/portaudio.cpp
index f6cf7c05..5cfee278 100644
--- a/Alc/backends/portaudio.cpp
+++ b/Alc/backends/portaudio.cpp
@@ -459,8 +459,8 @@ void PortBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Playback:
+ case DevProbe::Capture:
/* Includes null char. */
outnames->append(pa_device, sizeof(pa_device));
break;
diff --git a/Alc/backends/pulseaudio.cpp b/Alc/backends/pulseaudio.cpp
index bf952813..adae1a0f 100644
--- a/Alc/backends/pulseaudio.cpp
+++ b/Alc/backends/pulseaudio.cpp
@@ -1652,12 +1652,12 @@ void PulseBackendFactory::probe(DevProbe type, std::string *outnames)
};
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
probePlaybackDevices();
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
probeCaptureDevices();
std::for_each(CaptureDevices.cbegin(), CaptureDevices.cend(), add_device);
break;
diff --git a/Alc/backends/qsa.cpp b/Alc/backends/qsa.cpp
index abf046b1..d1171339 100644
--- a/Alc/backends/qsa.cpp
+++ b/Alc/backends/qsa.cpp
@@ -941,11 +941,11 @@ void QSABackendFactory::probe(DevProbe type, std::string *outnames)
switch (type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
deviceList(SND_PCM_CHANNEL_PLAYBACK, &DeviceNameMap);
std::for_each(DeviceNameMap.cbegin(), DeviceNameMap.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
deviceList(SND_PCM_CHANNEL_CAPTURE, &CaptureNameMap);
std::for_each(CaptureNameMap.cbegin(), CaptureNameMap.cend(), add_device);
break;
diff --git a/Alc/backends/sdl2.cpp b/Alc/backends/sdl2.cpp
index 84b34014..9699e274 100644
--- a/Alc/backends/sdl2.cpp
+++ b/Alc/backends/sdl2.cpp
@@ -207,7 +207,7 @@ bool SDL2BackendFactory::querySupport(BackendType type)
void SDL2BackendFactory::probe(DevProbe type, std::string *outnames)
{
- if(type != ALL_DEVICE_PROBE)
+ if(type != DevProbe::Playback)
return;
int num_devices{SDL_GetNumAudioDevices(SDL_FALSE)};
diff --git a/Alc/backends/sndio.cpp b/Alc/backends/sndio.cpp
index c75eebee..1b869fe7 100644
--- a/Alc/backends/sndio.cpp
+++ b/Alc/backends/sndio.cpp
@@ -481,8 +481,8 @@ void SndIOBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Playback:
+ case DevProbe::Capture:
/* Includes null char. */
outnames->append(sndio_device, sizeof(sndio_device));
break;
diff --git a/Alc/backends/solaris.cpp b/Alc/backends/solaris.cpp
index 043691ce..dd41de3e 100644
--- a/Alc/backends/solaris.cpp
+++ b/Alc/backends/solaris.cpp
@@ -278,7 +278,7 @@ void SolarisBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
{
#ifdef HAVE_STAT
struct stat buf;
@@ -288,7 +288,7 @@ void SolarisBackendFactory::probe(DevProbe type, std::string *outnames)
}
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
break;
}
}
diff --git a/Alc/backends/wasapi.cpp b/Alc/backends/wasapi.cpp
index ba26b70c..91e21446 100644
--- a/Alc/backends/wasapi.cpp
+++ b/Alc/backends/wasapi.cpp
@@ -469,9 +469,9 @@ DWORD WasapiProxy::messageHandler(void *ptr)
{
Enumerator = static_cast<IMMDeviceEnumerator*>(ptr);
- if(msg.lParam == ALL_DEVICE_PROBE)
+ if(msg.lParam == DevProbe::Playback)
hr = probe_devices(Enumerator, eRender, PlaybackDevices);
- else if(msg.lParam == CAPTURE_DEVICE_PROBE)
+ else if(msg.lParam == DevProbe::Capture)
hr = probe_devices(Enumerator, eCapture, CaptureDevices);
Enumerator->Release();
@@ -673,7 +673,7 @@ ALCenum WasapiPlayback::open(const ALCchar *name)
if(PlaybackDevices.empty())
{
ThreadRequest req = { mMsgEvent, 0 };
- if(PostThreadMessage(ThreadID, WM_USER_Enumerate, (WPARAM)&req, ALL_DEVICE_PROBE))
+ if(PostThreadMessage(ThreadID, WM_USER_Enumerate, (WPARAM)&req, DevProbe::Playback))
(void)WaitForResponse(&req);
}
@@ -1293,7 +1293,7 @@ ALCenum WasapiCapture::open(const ALCchar *name)
if(CaptureDevices.empty())
{
ThreadRequest req{ mMsgEvent, 0 };
- if(PostThreadMessage(ThreadID, WM_USER_Enumerate, (WPARAM)&req, CAPTURE_DEVICE_PROBE))
+ if(PostThreadMessage(ThreadID, WM_USER_Enumerate, (WPARAM)&req, DevProbe::Capture))
(void)WaitForResponse(&req);
}
@@ -1788,11 +1788,11 @@ void WasapiBackendFactory::probe(DevProbe type, std::string *outnames)
hr = WaitForResponse(&req);
if(SUCCEEDED(hr)) switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
std::for_each(CaptureDevices.cbegin(), CaptureDevices.cend(), add_device);
break;
}
diff --git a/Alc/backends/wave.cpp b/Alc/backends/wave.cpp
index cd6c6d5c..50142025 100644
--- a/Alc/backends/wave.cpp
+++ b/Alc/backends/wave.cpp
@@ -370,11 +370,11 @@ void WaveBackendFactory::probe(DevProbe type, std::string *outnames)
{
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
/* Includes null char. */
outnames->append(waveDevice, sizeof(waveDevice));
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
break;
}
}
diff --git a/Alc/backends/winmm.cpp b/Alc/backends/winmm.cpp
index 89f0e866..94cca828 100644
--- a/Alc/backends/winmm.cpp
+++ b/Alc/backends/winmm.cpp
@@ -623,12 +623,12 @@ void WinMMBackendFactory::probe(DevProbe type, std::string *outnames)
};
switch(type)
{
- case ALL_DEVICE_PROBE:
+ case DevProbe::Playback:
ProbePlaybackDevices();
std::for_each(PlaybackDevices.cbegin(), PlaybackDevices.cend(), add_device);
break;
- case CAPTURE_DEVICE_PROBE:
+ case DevProbe::Capture:
ProbeCaptureDevices();
std::for_each(CaptureDevices.cbegin(), CaptureDevices.cend(), add_device);
break;