aboutsummaryrefslogtreecommitdiffstats
path: root/alc/backends
diff options
context:
space:
mode:
Diffstat (limited to 'alc/backends')
-rw-r--r--alc/backends/alsa.cpp7
-rw-r--r--alc/backends/alsa.h2
-rw-r--r--alc/backends/coreaudio.cpp13
-rw-r--r--alc/backends/coreaudio.h2
-rw-r--r--alc/backends/dsound.cpp8
-rw-r--r--alc/backends/dsound.h2
-rw-r--r--alc/backends/jack.cpp8
-rw-r--r--alc/backends/jack.h2
-rw-r--r--alc/backends/loopback.cpp9
-rw-r--r--alc/backends/loopback.h2
-rw-r--r--alc/backends/null.cpp5
-rw-r--r--alc/backends/null.h2
-rw-r--r--alc/backends/oboe.h2
-rw-r--r--alc/backends/opensl.cpp6
-rw-r--r--alc/backends/opensl.h2
-rw-r--r--alc/backends/oss.cpp7
-rw-r--r--alc/backends/oss.h2
-rw-r--r--alc/backends/portaudio.cpp8
-rw-r--r--alc/backends/portaudio.h2
-rw-r--r--alc/backends/pulseaudio.cpp4
-rw-r--r--alc/backends/pulseaudio.h2
-rw-r--r--alc/backends/sndio.cpp6
-rw-r--r--alc/backends/sndio.h2
-rw-r--r--alc/backends/wasapi.cpp6
-rw-r--r--alc/backends/wasapi.h2
-rw-r--r--alc/backends/wave.cpp7
-rw-r--r--alc/backends/wave.h2
-rw-r--r--alc/backends/winmm.cpp6
-rw-r--r--alc/backends/winmm.h2
29 files changed, 62 insertions, 68 deletions
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index a6c7e178..f6f318eb 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/alsa.h"
+#include "alsa.h"
#include <algorithm>
#include <atomic>
@@ -36,12 +36,11 @@
#include <utility>
#include "albyte.h"
-#include "alcmain.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "aloptional.h"
-#include "alu.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
diff --git a/alc/backends/alsa.h b/alc/backends/alsa.h
index 1a28e6b9..b256dcf5 100644
--- a/alc/backends/alsa.h
+++ b/alc/backends/alsa.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_ALSA_H
#define BACKENDS_ALSA_H
-#include "backends/base.h"
+#include "base.h"
struct AlsaBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp
index 45c814bf..81ce32bc 100644
--- a/alc/backends/coreaudio.cpp
+++ b/alc/backends/coreaudio.cpp
@@ -20,23 +20,22 @@
#include "config.h"
-#include "backends/coreaudio.h"
+#include "coreaudio.h"
-#include <inttypes.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <cmath>
-#include "alcmain.h"
-#include "alu.h"
-#include "ringbuffer.h"
+#include "alnumeric.h"
#include "core/converter.h"
+#include "core/device.h"
#include "core/logging.h"
-#include "backends/base.h"
+#include "ringbuffer.h"
-#include <unistd.h>
#include <AudioUnit/AudioUnit.h>
#include <AudioToolbox/AudioToolbox.h>
diff --git a/alc/backends/coreaudio.h b/alc/backends/coreaudio.h
index 19e50eab..1252edde 100644
--- a/alc/backends/coreaudio.h
+++ b/alc/backends/coreaudio.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_COREAUDIO_H
#define BACKENDS_COREAUDIO_H
-#include "backends/base.h"
+#include "base.h"
struct CoreAudioBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index 928ff507..401f8165 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/dsound.h"
+#include "dsound.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -44,9 +44,9 @@
#include <algorithm>
#include <functional>
-#include "alcmain.h"
-#include "alu.h"
+#include "alnumeric.h"
#include "comptr.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
@@ -175,7 +175,7 @@ struct DSoundPlayback final : public BackendBase {
int mixerProc();
- void open(const ALCchar *name) override;
+ void open(const char *name) override;
bool reset() override;
void start() override;
void stop() override;
diff --git a/alc/backends/dsound.h b/alc/backends/dsound.h
index 3b5b344b..787f227a 100644
--- a/alc/backends/dsound.h
+++ b/alc/backends/dsound.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_DSOUND_H
#define BACKENDS_DSOUND_H
-#include "backends/base.h"
+#include "base.h"
struct DSoundBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index b7b35217..54bd19e6 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/jack.h"
+#include "jack.h"
#include <cstdlib>
#include <cstdio>
@@ -31,9 +31,9 @@
#include <thread>
#include <functional>
-#include "alcmain.h"
-#include "alu.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
+#include "alnumeric.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
diff --git a/alc/backends/jack.h b/alc/backends/jack.h
index 6f81a209..b83f24dd 100644
--- a/alc/backends/jack.h
+++ b/alc/backends/jack.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_JACK_H
#define BACKENDS_JACK_H
-#include "backends/base.h"
+#include "base.h"
struct JackBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/loopback.cpp b/alc/backends/loopback.cpp
index bafe8cc8..bf4ab246 100644
--- a/alc/backends/loopback.cpp
+++ b/alc/backends/loopback.cpp
@@ -20,10 +20,9 @@
#include "config.h"
-#include "backends/loopback.h"
+#include "loopback.h"
-#include "alcmain.h"
-#include "alu.h"
+#include "core/device.h"
namespace {
@@ -31,7 +30,7 @@ namespace {
struct LoopbackBackend final : public BackendBase {
LoopbackBackend(DeviceBase *device) noexcept : BackendBase{device} { }
- void open(const ALCchar *name) override;
+ void open(const char *name) override;
bool reset() override;
void start() override;
void stop() override;
@@ -40,7 +39,7 @@ struct LoopbackBackend final : public BackendBase {
};
-void LoopbackBackend::open(const ALCchar *name)
+void LoopbackBackend::open(const char *name)
{
mDevice->DeviceName = name;
}
diff --git a/alc/backends/loopback.h b/alc/backends/loopback.h
index 1a031a1f..cb42b3c8 100644
--- a/alc/backends/loopback.h
+++ b/alc/backends/loopback.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_LOOPBACK_H
#define BACKENDS_LOOPBACK_H
-#include "backends/base.h"
+#include "base.h"
struct LoopbackBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp
index 763d4d2e..5a8fc255 100644
--- a/alc/backends/null.cpp
+++ b/alc/backends/null.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/null.h"
+#include "null.h"
#include <exception>
#include <atomic>
@@ -30,9 +30,8 @@
#include <functional>
#include <thread>
-#include "alcmain.h"
+#include "core/device.h"
#include "almalloc.h"
-#include "alu.h"
#include "core/helpers.h"
#include "threads.h"
diff --git a/alc/backends/null.h b/alc/backends/null.h
index c9d1b3b3..7048cad6 100644
--- a/alc/backends/null.h
+++ b/alc/backends/null.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_NULL_H
#define BACKENDS_NULL_H
-#include "backends/base.h"
+#include "base.h"
struct NullBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/oboe.h b/alc/backends/oboe.h
index 228ec807..a39c2445 100644
--- a/alc/backends/oboe.h
+++ b/alc/backends/oboe.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_OBOE_H
#define BACKENDS_OBOE_H
-#include "backends/base.h"
+#include "base.h"
struct OboeBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp
index af656470..7be7f031 100644
--- a/alc/backends/opensl.cpp
+++ b/alc/backends/opensl.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#include "backends/opensl.h"
+#include "opensl.h"
#include <stdlib.h>
#include <jni.h>
@@ -33,8 +33,8 @@
#include <functional>
#include "albit.h"
-#include "alcmain.h"
-#include "alu.h"
+#include "alnumeric.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "opthelpers.h"
diff --git a/alc/backends/opensl.h b/alc/backends/opensl.h
index 36586bbb..b8162447 100644
--- a/alc/backends/opensl.h
+++ b/alc/backends/opensl.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_OSL_H
#define BACKENDS_OSL_H
-#include "backends/base.h"
+#include "base.h"
struct OSLBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index d769a1eb..6d4fa261 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/oss.h"
+#include "oss.h"
#include <fcntl.h>
#include <poll.h>
@@ -41,13 +41,12 @@
#include <thread>
#include <utility>
-#include "alcmain.h"
-#include "alconfig.h"
#include "albyte.h"
+#include "alc/alconfig.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "aloptional.h"
-#include "alu.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
diff --git a/alc/backends/oss.h b/alc/backends/oss.h
index 798da456..4f2c00b9 100644
--- a/alc/backends/oss.h
+++ b/alc/backends/oss.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_OSS_H
#define BACKENDS_OSS_H
-#include "backends/base.h"
+#include "base.h"
struct OSSBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp
index 8f41b12a..2d5cd36d 100644
--- a/alc/backends/portaudio.cpp
+++ b/alc/backends/portaudio.cpp
@@ -20,15 +20,15 @@
#include "config.h"
-#include "backends/portaudio.h"
+#include "portaudio.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include "alcmain.h"
-#include "alu.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
+#include "alnumeric.h"
+#include "core/device.h"
#include "core/logging.h"
#include "dynload.h"
#include "ringbuffer.h"
diff --git a/alc/backends/portaudio.h b/alc/backends/portaudio.h
index 34bb8d1b..c35ccff2 100644
--- a/alc/backends/portaudio.h
+++ b/alc/backends/portaudio.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_PORTAUDIO_H
#define BACKENDS_PORTAUDIO_H
-#include "backends/base.h"
+#include "base.h"
struct PortBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index da1ffcb0..23bcecad 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#include "backends/pulseaudio.h"
+#include "pulseaudio.h"
#include <algorithm>
#include <array>
@@ -43,7 +43,7 @@
#include <utility>
#include "albyte.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "aloptional.h"
diff --git a/alc/backends/pulseaudio.h b/alc/backends/pulseaudio.h
index 60ebbc36..6690fe8a 100644
--- a/alc/backends/pulseaudio.h
+++ b/alc/backends/pulseaudio.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_PULSEAUDIO_H
#define BACKENDS_PULSEAUDIO_H
-#include "backends/base.h"
+#include "base.h"
class PulseBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp
index c7c42210..2d8b424c 100644
--- a/alc/backends/sndio.cpp
+++ b/alc/backends/sndio.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/sndio.h"
+#include "sndio.h"
#include <stdio.h>
#include <stdlib.h>
@@ -29,8 +29,8 @@
#include <thread>
#include <functional>
-#include "alcmain.h"
-#include "alu.h"
+#include "alnumeric.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
diff --git a/alc/backends/sndio.h b/alc/backends/sndio.h
index 9b93199f..d9433191 100644
--- a/alc/backends/sndio.h
+++ b/alc/backends/sndio.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_SNDIO_H
#define BACKENDS_SNDIO_H
-#include "backends/base.h"
+#include "base.h"
struct SndIOBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 114c69e0..d38fc25d 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/wasapi.h"
+#include "wasapi.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -56,10 +56,10 @@
#include <vector>
#include "albit.h"
-#include "alcmain.h"
-#include "alu.h"
+#include "alnumeric.h"
#include "comptr.h"
#include "core/converter.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
diff --git a/alc/backends/wasapi.h b/alc/backends/wasapi.h
index fa4b811e..bb2671ee 100644
--- a/alc/backends/wasapi.h
+++ b/alc/backends/wasapi.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_WASAPI_H
#define BACKENDS_WASAPI_H
-#include "backends/base.h"
+#include "base.h"
struct WasapiBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp
index 434a5fb1..259cbc62 100644
--- a/alc/backends/wave.cpp
+++ b/alc/backends/wave.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/wave.h"
+#include "wave.h"
#include <algorithm>
#include <atomic>
@@ -35,11 +35,10 @@
#include "albit.h"
#include "albyte.h"
-#include "alcmain.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
#include "almalloc.h"
#include "alnumeric.h"
-#include "alu.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "opthelpers.h"
diff --git a/alc/backends/wave.h b/alc/backends/wave.h
index 926e2198..e768d336 100644
--- a/alc/backends/wave.h
+++ b/alc/backends/wave.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_WAVE_H
#define BACKENDS_WAVE_H
-#include "backends/base.h"
+#include "base.h"
struct WaveBackendFactory final : public BackendFactory {
public:
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index c346a828..42aee313 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#include "backends/winmm.h"
+#include "winmm.h"
#include <stdlib.h>
#include <stdio.h>
@@ -38,8 +38,8 @@
#include <algorithm>
#include <functional>
-#include "alcmain.h"
-#include "alu.h"
+#include "alnumeric.h"
+#include "core/device.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
diff --git a/alc/backends/winmm.h b/alc/backends/winmm.h
index a376b8a4..45a706aa 100644
--- a/alc/backends/winmm.h
+++ b/alc/backends/winmm.h
@@ -1,7 +1,7 @@
#ifndef BACKENDS_WINMM_H
#define BACKENDS_WINMM_H
-#include "backends/base.h"
+#include "base.h"
struct WinMMBackendFactory final : public BackendFactory {
public:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 21:48:52 +0000