aboutsummaryrefslogtreecommitdiffstats
path: root/alc/backends
diff options
context:
space:
mode:
Diffstat (limited to 'alc/backends')
-rw-r--r--alc/backends/alsa.cpp16
-rw-r--r--alc/backends/coreaudio.cpp4
-rw-r--r--alc/backends/dsound.cpp9
-rw-r--r--alc/backends/jack.cpp5
-rw-r--r--alc/backends/oss.cpp14
-rw-r--r--alc/backends/pulseaudio.cpp6
-rw-r--r--alc/backends/solaris.cpp4
-rw-r--r--alc/backends/wasapi.cpp18
-rw-r--r--alc/backends/wave.cpp4
-rw-r--r--alc/backends/winmm.cpp2
10 files changed, 42 insertions, 40 deletions
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index c1690867..ce368f5e 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -35,6 +35,7 @@
#include <string>
#include <thread>
#include <utility>
+#include <vector>
#include "albit.h"
#include "alc/alconfig.h"
@@ -46,7 +47,6 @@
#include "dynload.h"
#include "ringbuffer.h"
#include "threads.h"
-#include "vector.h"
#include <alsa/asoundlib.h>
@@ -248,8 +248,8 @@ struct DevMap {
{ }
};
-al::vector<DevMap> PlaybackDevices;
-al::vector<DevMap> CaptureDevices;
+std::vector<DevMap> PlaybackDevices;
+std::vector<DevMap> CaptureDevices;
const char *prefix_name(snd_pcm_stream_t stream)
@@ -258,9 +258,9 @@ const char *prefix_name(snd_pcm_stream_t stream)
return (stream==SND_PCM_STREAM_PLAYBACK) ? "device-prefix" : "capture-prefix";
}
-al::vector<DevMap> probe_devices(snd_pcm_stream_t stream)
+std::vector<DevMap> probe_devices(snd_pcm_stream_t stream)
{
- al::vector<DevMap> devlist;
+ std::vector<DevMap> devlist;
snd_ctl_card_info_t *info;
snd_ctl_card_info_malloc(&info);
@@ -439,7 +439,7 @@ struct AlsaPlayback final : public BackendBase {
std::mutex mMutex;
uint mFrameStep{};
- al::vector<std::byte> mBuffer;
+ std::vector<std::byte> mBuffer;
std::atomic<bool> mKillNow{true};
std::thread mThread;
@@ -880,7 +880,7 @@ struct AlsaCapture final : public BackendBase {
snd_pcm_t *mPcmHandle{nullptr};
- al::vector<std::byte> mBuffer;
+ std::vector<std::byte> mBuffer;
bool mDoCapture{false};
RingBufferPtr mRing{nullptr};
@@ -1024,7 +1024,7 @@ void AlsaCapture::stop()
/* The ring buffer implicitly captures when checking availability.
* Direct access needs to explicitly capture it into temp storage.
*/
- auto temp = al::vector<std::byte>(
+ auto temp = std::vector<std::byte>(
static_cast<size_t>(snd_pcm_frames_to_bytes(mPcmHandle, avail)));
captureSamples(temp.data(), avail);
mBuffer = std::move(temp);
diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp
index c2a79815..521f085d 100644
--- a/alc/backends/coreaudio.cpp
+++ b/alc/backends/coreaudio.cpp
@@ -25,13 +25,13 @@
#include <cmath>
#include <inttypes.h>
#include <memory>
-#include <mutex>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string>
#include <string.h>
#include <unistd.h>
+#include <vector>
#include "alnumeric.h"
#include "core/converter.h"
@@ -578,7 +578,7 @@ struct CoreAudioCapture final : public BackendBase {
SampleConverterPtr mConverter;
- al::vector<char> mCaptureData;
+ std::vector<char> mCaptureData;
RingBufferPtr mRing{nullptr};
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index ffcd8430..5fc8a1c7 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -46,6 +46,7 @@
#include "albit.h"
#include "alnumeric.h"
+#include "alspan.h"
#include "comptr.h"
#include "core/device.h"
#include "core/helpers.h"
@@ -130,10 +131,10 @@ struct DevMap {
{ }
};
-al::vector<DevMap> PlaybackDevices;
-al::vector<DevMap> CaptureDevices;
+std::vector<DevMap> PlaybackDevices;
+std::vector<DevMap> CaptureDevices;
-bool checkName(const al::vector<DevMap> &list, const std::string &name)
+bool checkName(const al::span<DevMap> list, const std::string &name)
{
auto match_name = [&name](const DevMap &entry) -> bool
{ return entry.name == name; };
@@ -145,7 +146,7 @@ BOOL CALLBACK DSoundEnumDevices(GUID *guid, const WCHAR *desc, const WCHAR*, voi
if(!guid)
return TRUE;
- auto& devices = *static_cast<al::vector<DevMap>*>(data);
+ auto& devices = *static_cast<std::vector<DevMap>*>(data);
const std::string basename{DEVNAME_HEAD + wstr_to_utf8(desc)};
int count{1};
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index b12edf9f..9e023e21 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -30,6 +30,7 @@
#include <mutex>
#include <thread>
#include <functional>
+#include <vector>
#include "albit.h"
#include "alc/alconfig.h"
@@ -168,10 +169,10 @@ struct DeviceEntry {
{ }
};
-al::vector<DeviceEntry> PlaybackList;
+std::vector<DeviceEntry> PlaybackList;
-void EnumerateDevices(jack_client_t *client, al::vector<DeviceEntry> &list)
+void EnumerateDevices(jack_client_t *client, std::vector<DeviceEntry> &list)
{
std::remove_reference_t<decltype(list)>{}.swap(list);
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 1fdee701..dc18c4c3 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -38,6 +38,7 @@
#include <string>
#include <thread>
#include <utility>
+#include <vector>
#include "alc/alconfig.h"
#include "almalloc.h"
@@ -47,7 +48,6 @@
#include "core/logging.h"
#include "ringbuffer.h"
#include "threads.h"
-#include "vector.h"
#include <sys/soundcard.h>
@@ -88,22 +88,22 @@ struct DevMap {
std::string device_name;
};
-al::vector<DevMap> PlaybackDevices;
-al::vector<DevMap> CaptureDevices;
+std::vector<DevMap> PlaybackDevices;
+std::vector<DevMap> CaptureDevices;
#ifdef ALC_OSS_COMPAT
#define DSP_CAP_OUTPUT 0x00020000
#define DSP_CAP_INPUT 0x00010000
-void ALCossListPopulate(al::vector<DevMap> &devlist, int type)
+void ALCossListPopulate(std::vector<DevMap> &devlist, int type)
{
devlist.emplace_back(DevMap{DefaultName, (type==DSP_CAP_INPUT) ? DefaultCapture : DefaultPlayback});
}
#else
-void ALCossListAppend(al::vector<DevMap> &list, al::span<const char> handle, al::span<const char> path)
+void ALCossListAppend(std::vector<DevMap> &list, al::span<const char> handle, al::span<const char> path)
{
#ifdef ALC_OSS_DEVNODE_TRUC
for(size_t i{0};i < path.size();++i)
@@ -148,7 +148,7 @@ void ALCossListAppend(al::vector<DevMap> &list, al::span<const char> handle, al:
TRACE("Got device \"%s\", \"%s\"\n", entry.name.c_str(), entry.device_name.c_str());
}
-void ALCossListPopulate(al::vector<DevMap> &devlist, int type_flag)
+void ALCossListPopulate(std::vector<DevMap> &devlist, int type_flag)
{
int fd{open("/dev/mixer", O_RDONLY)};
if(fd < 0)
@@ -234,7 +234,7 @@ struct OSSPlayback final : public BackendBase {
int mFd{-1};
- al::vector<std::byte> mMixData;
+ std::vector<std::byte> mMixData;
std::atomic<bool> mKillNow{true};
std::thread mThread;
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index e5696817..d2883f5c 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -37,6 +37,7 @@
#include <string>
#include <sys/types.h>
#include <utility>
+#include <vector>
#include "albit.h"
#include "alc/alconfig.h"
@@ -49,7 +50,6 @@
#include "dynload.h"
#include "opthelpers.h"
#include "strutils.h"
-#include "vector.h"
#include <pulse/pulseaudio.h>
@@ -282,8 +282,8 @@ bool checkName(const al::span<const DevMap> list, const std::string &name)
return std::find_if(list.cbegin(), list.cend(), match_name) != list.cend();
}
-al::vector<DevMap> PlaybackDevices;
-al::vector<DevMap> CaptureDevices;
+std::vector<DevMap> PlaybackDevices;
+std::vector<DevMap> CaptureDevices;
/* Global flags and properties */
diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp
index 4eeeafac..ae87e7eb 100644
--- a/alc/backends/solaris.cpp
+++ b/alc/backends/solaris.cpp
@@ -35,6 +35,7 @@
#include <poll.h>
#include <math.h>
#include <string.h>
+#include <vector>
#include <thread>
#include <functional>
@@ -44,7 +45,6 @@
#include "core/helpers.h"
#include "core/logging.h"
#include "threads.h"
-#include "vector.h"
#include <sys/audioio.h>
@@ -70,7 +70,7 @@ struct SolarisBackend final : public BackendBase {
int mFd{-1};
uint mFrameStep{};
- al::vector<std::byte> mBuffer;
+ std::vector<std::byte> mBuffer;
std::atomic<bool> mKillNow{true};
std::thread mThread;
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 97f0a291..d4ad38e2 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -59,6 +59,7 @@
#include "albit.h"
#include "alc/alconfig.h"
#include "alnumeric.h"
+#include "alspan.h"
#include "comptr.h"
#include "core/converter.h"
#include "core/device.h"
@@ -180,15 +181,14 @@ struct DevMap {
{ }
};
-bool checkName(const al::vector<DevMap> &list, const std::string &name)
+bool checkName(const al::span<DevMap> list, const std::string &name)
{
- auto match_name = [&name](const DevMap &entry) -> bool
- { return entry.name == name; };
+ auto match_name = [&name](const DevMap &entry) -> bool { return entry.name == name; };
return std::find_if(list.cbegin(), list.cend(), match_name) != list.cend();
}
-al::vector<DevMap> PlaybackDevices;
-al::vector<DevMap> CaptureDevices;
+std::vector<DevMap> PlaybackDevices;
+std::vector<DevMap> CaptureDevices;
using NameGUIDPair = std::pair<std::string,std::string>;
@@ -262,7 +262,7 @@ EndpointFormFactor get_device_formfactor(IMMDevice *device)
}
-void add_device(IMMDevice *device, const WCHAR *devid, al::vector<DevMap> &list)
+void add_device(IMMDevice *device, const WCHAR *devid, std::vector<DevMap> &list)
{
for(auto &entry : list)
{
@@ -301,9 +301,9 @@ WCHAR *get_device_id(IMMDevice *device)
return devid;
}
-void probe_devices(IMMDeviceEnumerator *devenum, EDataFlow flowdir, al::vector<DevMap> &list)
+void probe_devices(IMMDeviceEnumerator *devenum, EDataFlow flowdir, std::vector<DevMap> &list)
{
- al::vector<DevMap>{}.swap(list);
+ std::vector<DevMap>{}.swap(list);
ComPtr<IMMDeviceCollection> coll;
HRESULT hr{devenum->EnumAudioEndpoints(flowdir, DEVICE_STATE_ACTIVE, al::out_ptr(coll))};
@@ -1355,7 +1355,7 @@ FORCE_ALIGN int WasapiCapture::recordProc()
althrd_setname(RECORD_THREAD_NAME);
- al::vector<float> samples;
+ std::vector<float> samples;
while(!mKillNow.load(std::memory_order_relaxed))
{
UINT32 avail;
diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp
index f8302f1e..1ee2fe51 100644
--- a/alc/backends/wave.cpp
+++ b/alc/backends/wave.cpp
@@ -32,6 +32,7 @@
#include <exception>
#include <functional>
#include <thread>
+#include <vector>
#include "albit.h"
#include "alc/alconfig.h"
@@ -43,7 +44,6 @@
#include "opthelpers.h"
#include "strutils.h"
#include "threads.h"
-#include "vector.h"
namespace {
@@ -104,7 +104,7 @@ struct WaveBackend final : public BackendBase {
FILE *mFile{nullptr};
long mDataStart{-1};
- al::vector<std::byte> mBuffer;
+ std::vector<std::byte> mBuffer;
std::atomic<bool> mKillNow{true};
std::thread mThread;
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index edb875a0..0345fe10 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -58,7 +58,7 @@ namespace {
std::vector<std::string> PlaybackDevices;
std::vector<std::string> CaptureDevices;
-bool checkName(const al::vector<std::string> &list, const std::string &name)
+bool checkName(const std::vector<std::string> &list, const std::string &name)
{ return std::find(list.cbegin(), list.cend(), name) != list.cend(); }
void ProbePlaybackDevices(void)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-20 15:21:26 +0000