aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/alc.cpp6
-rw-r--r--Alc/backends/alsa.cpp127
-rw-r--r--Alc/backends/alsa.h20
-rw-r--r--CMakeLists.txt2
4 files changed, 80 insertions, 75 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index d4e2dda5..0e61385a 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -62,6 +62,9 @@
#ifdef HAVE_PULSEAUDIO
#include "backends/pulseaudio.h"
#endif
+#ifdef HAVE_ALSA
+#include "backends/alsa.h"
+#endif
#ifdef HAVE_WASAPI
#include "backends/wasapi.h"
#endif
@@ -84,6 +87,9 @@ struct BackendInfo BackendList[] = {
#ifdef HAVE_PULSEAUDIO
{ "pulse", PulseBackendFactory::getFactory },
#endif
+#ifdef HAVE_ALSA
+ { "alsa", AlsaBackendFactory::getFactory },
+#endif
#ifdef HAVE_WASAPI
{ "wasapi", WasapiBackendFactory::getFactory },
#endif
diff --git a/Alc/backends/alsa.cpp b/Alc/backends/alsa.cpp
index 23e33e6b..ee42842b 100644
--- a/Alc/backends/alsa.cpp
+++ b/Alc/backends/alsa.cpp
@@ -20,6 +20,8 @@
#include "config.h"
+#include "backends/alsa.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <memory.h>
@@ -36,8 +38,6 @@
#include "ringbuffer.h"
#include "compat.h"
-#include "backends/base.h"
-
#include <alsa/asoundlib.h>
@@ -421,8 +421,6 @@ int verify_state(snd_pcm_t *handle)
return state;
}
-} // namespace
-
struct ALCplaybackAlsa final : public ALCbackend {
snd_pcm_t *pcmHandle{nullptr};
@@ -433,26 +431,25 @@ struct ALCplaybackAlsa final : public ALCbackend {
std::thread thread;
};
-static int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self);
-static int ALCplaybackAlsa_mixerNoMMapProc(ALCplaybackAlsa *self);
-
-static void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device);
-static void ALCplaybackAlsa_Destruct(ALCplaybackAlsa *self);
-static ALCenum ALCplaybackAlsa_open(ALCplaybackAlsa *self, const ALCchar *name);
-static ALCboolean ALCplaybackAlsa_reset(ALCplaybackAlsa *self);
-static ALCboolean ALCplaybackAlsa_start(ALCplaybackAlsa *self);
-static void ALCplaybackAlsa_stop(ALCplaybackAlsa *self);
-static DECLARE_FORWARD2(ALCplaybackAlsa, ALCbackend, ALCenum, captureSamples, void*, ALCuint)
-static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, ALCuint, availableSamples)
-static ClockLatency ALCplaybackAlsa_getClockLatency(ALCplaybackAlsa *self);
-static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, lock)
-static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, unlock)
+int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self);
+int ALCplaybackAlsa_mixerNoMMapProc(ALCplaybackAlsa *self);
+
+void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device);
+void ALCplaybackAlsa_Destruct(ALCplaybackAlsa *self);
+ALCenum ALCplaybackAlsa_open(ALCplaybackAlsa *self, const ALCchar *name);
+ALCboolean ALCplaybackAlsa_reset(ALCplaybackAlsa *self);
+ALCboolean ALCplaybackAlsa_start(ALCplaybackAlsa *self);
+void ALCplaybackAlsa_stop(ALCplaybackAlsa *self);
+DECLARE_FORWARD2(ALCplaybackAlsa, ALCbackend, ALCenum, captureSamples, void*, ALCuint)
+DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, ALCuint, availableSamples)
+ClockLatency ALCplaybackAlsa_getClockLatency(ALCplaybackAlsa *self);
+DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, lock)
+DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, unlock)
DECLARE_DEFAULT_ALLOCATORS(ALCplaybackAlsa)
-
DEFINE_ALCBACKEND_VTABLE(ALCplaybackAlsa);
-static void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device)
+void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device)
{
new (self) ALCplaybackAlsa{};
ALCbackend_Construct(STATIC_CAST(ALCbackend, self), device);
@@ -470,7 +467,7 @@ void ALCplaybackAlsa_Destruct(ALCplaybackAlsa *self)
}
-static int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self)
+int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
@@ -557,7 +554,7 @@ static int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self)
return 0;
}
-static int ALCplaybackAlsa_mixerNoMMapProc(ALCplaybackAlsa *self)
+int ALCplaybackAlsa_mixerNoMMapProc(ALCplaybackAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
@@ -650,7 +647,7 @@ static int ALCplaybackAlsa_mixerNoMMapProc(ALCplaybackAlsa *self)
}
-static ALCenum ALCplaybackAlsa_open(ALCplaybackAlsa *self, const ALCchar *name)
+ALCenum ALCplaybackAlsa_open(ALCplaybackAlsa *self, const ALCchar *name)
{
const char *driver{};
if(name)
@@ -690,7 +687,7 @@ static ALCenum ALCplaybackAlsa_open(ALCplaybackAlsa *self, const ALCchar *name)
return ALC_NO_ERROR;
}
-static ALCboolean ALCplaybackAlsa_reset(ALCplaybackAlsa *self)
+ALCboolean ALCplaybackAlsa_reset(ALCplaybackAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
@@ -842,7 +839,7 @@ error:
return ALC_FALSE;
}
-static ALCboolean ALCplaybackAlsa_start(ALCplaybackAlsa *self)
+ALCboolean ALCplaybackAlsa_start(ALCplaybackAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
int (*thread_func)(ALCplaybackAlsa*){};
@@ -895,7 +892,7 @@ error:
return ALC_FALSE;
}
-static void ALCplaybackAlsa_stop(ALCplaybackAlsa *self)
+void ALCplaybackAlsa_stop(ALCplaybackAlsa *self)
{
if(self->killNow.exchange(AL_TRUE, std::memory_order_acq_rel) || !self->thread.joinable())
return;
@@ -905,7 +902,7 @@ static void ALCplaybackAlsa_stop(ALCplaybackAlsa *self)
self->buffer.clear();
}
-static ClockLatency ALCplaybackAlsa_getClockLatency(ALCplaybackAlsa *self)
+ClockLatency ALCplaybackAlsa_getClockLatency(ALCplaybackAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
ClockLatency ret;
@@ -937,23 +934,23 @@ struct ALCcaptureAlsa final : public ALCbackend {
snd_pcm_sframes_t last_avail{0};
};
-static void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device);
-static void ALCcaptureAlsa_Destruct(ALCcaptureAlsa *self);
-static ALCenum ALCcaptureAlsa_open(ALCcaptureAlsa *self, const ALCchar *name);
-static DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, ALCboolean, reset)
-static ALCboolean ALCcaptureAlsa_start(ALCcaptureAlsa *self);
-static void ALCcaptureAlsa_stop(ALCcaptureAlsa *self);
-static ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buffer, ALCuint samples);
-static ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self);
-static ClockLatency ALCcaptureAlsa_getClockLatency(ALCcaptureAlsa *self);
-static DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, lock)
-static DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, unlock)
+void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device);
+void ALCcaptureAlsa_Destruct(ALCcaptureAlsa *self);
+ALCenum ALCcaptureAlsa_open(ALCcaptureAlsa *self, const ALCchar *name);
+DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, ALCboolean, reset)
+ALCboolean ALCcaptureAlsa_start(ALCcaptureAlsa *self);
+void ALCcaptureAlsa_stop(ALCcaptureAlsa *self);
+ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buffer, ALCuint samples);
+ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self);
+ClockLatency ALCcaptureAlsa_getClockLatency(ALCcaptureAlsa *self);
+DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, lock)
+DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, unlock)
DECLARE_DEFAULT_ALLOCATORS(ALCcaptureAlsa)
DEFINE_ALCBACKEND_VTABLE(ALCcaptureAlsa);
-static void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device)
+void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device)
{
new (self) ALCcaptureAlsa{};
ALCbackend_Construct(STATIC_CAST(ALCbackend, self), device);
@@ -974,7 +971,7 @@ void ALCcaptureAlsa_Destruct(ALCcaptureAlsa *self)
}
-static ALCenum ALCcaptureAlsa_open(ALCcaptureAlsa *self, const ALCchar *name)
+ALCenum ALCcaptureAlsa_open(ALCcaptureAlsa *self, const ALCchar *name)
{
ALCdevice *device = STATIC_CAST(ALCbackend, self)->mDevice;
const char *driver{};
@@ -1101,7 +1098,7 @@ error2:
return ALC_INVALID_VALUE;
}
-static ALCboolean ALCcaptureAlsa_start(ALCcaptureAlsa *self)
+ALCboolean ALCcaptureAlsa_start(ALCcaptureAlsa *self)
{
int err{snd_pcm_prepare(self->pcmHandle)};
if(err < 0)
@@ -1123,7 +1120,7 @@ static ALCboolean ALCcaptureAlsa_start(ALCcaptureAlsa *self)
return ALC_TRUE;
}
-static void ALCcaptureAlsa_stop(ALCcaptureAlsa *self)
+void ALCcaptureAlsa_stop(ALCcaptureAlsa *self)
{
/* OpenAL requires access to unread audio after stopping, but ALSA's
* snd_pcm_drain is unreliable and snd_pcm_drop drops it. Capture what's
@@ -1143,7 +1140,7 @@ static void ALCcaptureAlsa_stop(ALCcaptureAlsa *self)
self->doCapture = false;
}
-static ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buffer, ALCuint samples)
+ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buffer, ALCuint samples)
{
ALCdevice *device = STATIC_CAST(ALCbackend, self)->mDevice;
@@ -1207,7 +1204,7 @@ static ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buff
return ALC_NO_ERROR;
}
-static ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self)
+ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self)
{
ALCdevice *device = STATIC_CAST(ALCbackend, self)->mDevice;
@@ -1278,7 +1275,7 @@ static ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self)
return ll_ringbuffer_read_space(self->ring);
}
-static ClockLatency ALCcaptureAlsa_getClockLatency(ALCcaptureAlsa *self)
+ClockLatency ALCcaptureAlsa_getClockLatency(ALCcaptureAlsa *self)
{
ALCdevice *device{STATIC_CAST(ALCbackend, self)->mDevice};
ClockLatency ret;
@@ -1298,19 +1295,13 @@ static ClockLatency ALCcaptureAlsa_getClockLatency(ALCcaptureAlsa *self)
return ret;
}
+} // namespace
-struct ALCalsaBackendFactory final : public ALCbackendFactory {
- ALCalsaBackendFactory() noexcept;
-};
-static ALCboolean ALCalsaBackendFactory_init(ALCalsaBackendFactory* UNUSED(self))
-{
- if(!alsa_load())
- return ALC_FALSE;
- return ALC_TRUE;
-}
+bool AlsaBackendFactory::init()
+{ return !!alsa_load(); }
-static void ALCalsaBackendFactory_deinit(ALCalsaBackendFactory* UNUSED(self))
+void AlsaBackendFactory::deinit()
{
PlaybackDevices.clear();
CaptureDevices.clear();
@@ -1322,14 +1313,10 @@ static void ALCalsaBackendFactory_deinit(ALCalsaBackendFactory* UNUSED(self))
#endif
}
-static ALCboolean ALCalsaBackendFactory_querySupport(ALCalsaBackendFactory* UNUSED(self), ALCbackend_Type type)
-{
- if(type == ALCbackend_Playback || type == ALCbackend_Capture)
- return ALC_TRUE;
- return ALC_FALSE;
-}
+bool AlsaBackendFactory::querySupport(ALCbackend_Type type)
+{ return (type == ALCbackend_Playback || type == ALCbackend_Capture); }
-static void ALCalsaBackendFactory_probe(ALCalsaBackendFactory* UNUSED(self), enum DevProbe type, std::string *outnames)
+void AlsaBackendFactory::probe(enum DevProbe type, std::string *outnames)
{
auto add_device = [outnames](const DevMap &entry) -> void
{
@@ -1352,7 +1339,7 @@ static void ALCalsaBackendFactory_probe(ALCalsaBackendFactory* UNUSED(self), enu
}
}
-static ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UNUSED(self), ALCdevice *device, ALCbackend_Type type)
+ALCbackend *AlsaBackendFactory::createBackend(ALCdevice *device, ALCbackend_Type type)
{
if(type == ALCbackend_Playback)
{
@@ -1372,16 +1359,8 @@ static ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UN
return nullptr;
}
-DEFINE_ALCBACKENDFACTORY_VTABLE(ALCalsaBackendFactory);
-
-
-ALCalsaBackendFactory::ALCalsaBackendFactory() noexcept
- : ALCbackendFactory{GET_VTABLE2(ALCalsaBackendFactory, ALCbackendFactory)}
-{
-}
-
-ALCbackendFactory *ALCalsaBackendFactory_getFactory(void)
+BackendFactory &AlsaBackendFactory::getFactory()
{
- static ALCalsaBackendFactory factory{};
- return STATIC_CAST(ALCbackendFactory, &factory);
+ static AlsaBackendFactory factory{};
+ return factory;
}
diff --git a/Alc/backends/alsa.h b/Alc/backends/alsa.h
new file mode 100644
index 00000000..3f772115
--- /dev/null
+++ b/Alc/backends/alsa.h
@@ -0,0 +1,20 @@
+#ifndef BACKENDS_ALSA_H
+#define BACKENDS_ALSA_H
+
+#include "backends/base.h"
+
+struct AlsaBackendFactory final : public BackendFactory {
+public:
+ bool init() override;
+ void deinit() override;
+
+ bool querySupport(ALCbackend_Type type) override;
+
+ void probe(enum DevProbe type, std::string *outnames) override;
+
+ ALCbackend *createBackend(ALCdevice *device, ALCbackend_Type type) override;
+
+ static BackendFactory &getFactory();
+};
+
+#endif /* BACKENDS_ALSA_H */
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b2cab60..66a2dbe5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1004,7 +1004,7 @@ IF(ALSA_FOUND)
IF(ALSOFT_BACKEND_ALSA)
SET(HAVE_ALSA 1)
SET(BACKENDS "${BACKENDS} ALSA${IS_LINKED},")
- SET(ALC_OBJS ${ALC_OBJS} Alc/backends/alsa.cpp)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/backends/alsa.cpp Alc/backends/alsa.h)
ADD_BACKEND_LIBS(${ALSA_LIBRARIES})
SET(INC_PATHS ${INC_PATHS} ${ALSA_INCLUDE_DIRS})
ENDIF()
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 19:34:58 +0000