aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--alc/alc.cpp2
-rw-r--r--alc/alconfig.cpp2
-rw-r--r--alc/backends/alsa.cpp2
-rw-r--r--alc/backends/dsound.cpp2
-rw-r--r--alc/backends/jack.cpp2
-rw-r--r--alc/backends/null.cpp2
-rw-r--r--alc/backends/opensl.cpp2
-rw-r--r--alc/backends/oss.cpp2
-rw-r--r--alc/backends/pulseaudio.cpp2
-rw-r--r--alc/backends/sndio.cpp2
-rw-r--r--alc/backends/solaris.cpp2
-rw-r--r--alc/backends/wasapi.cpp2
-rw-r--r--alc/backends/wave.cpp2
-rw-r--r--alc/backends/winmm.cpp2
-rw-r--r--alc/hrtf.cpp2
-rw-r--r--core/helpers.cpp (renamed from alc/helpers.cpp)24
-rw-r--r--core/helpers.h (renamed from alc/compat.h)6
18 files changed, 23 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f1894fa..1b5f8395 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -667,6 +667,8 @@ set(CORE_OBJS
core/fmt_traits.h
core/fpu_ctrl.cpp
core/fpu_ctrl.h
+ core/helpers.cpp
+ core/helpers.h
core/logging.cpp
core/logging.h
core/mastering.cpp
@@ -751,7 +753,6 @@ set(ALC_OBJS
alc/bformatdec.h
alc/buffer_storage.cpp
alc/buffer_storage.h
- alc/compat.h
alc/converter.cpp
alc/converter.h
alc/effectslot.cpp
@@ -772,7 +773,6 @@ set(ALC_OBJS
alc/effects/reverb.cpp
alc/effects/vmorpher.cpp
alc/front_stablizer.h
- alc/helpers.cpp
alc/hrtf.cpp
alc/hrtf.h
alc/inprogext.h
diff --git a/alc/alc.cpp b/alc/alc.cpp
index b79ea9c8..c4e2d61c 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -79,12 +79,12 @@
#include "async_event.h"
#include "atomic.h"
#include "bformatdec.h"
-#include "compat.h"
#include "core/ambidefs.h"
#include "core/bs2b.h"
#include "core/cpu_caps.h"
#include "core/devformat.h"
#include "core/except.h"
+#include "core/helpers.h"
#include "core/mastering.h"
#include "core/filters/nfc.h"
#include "core/filters/splitter.h"
diff --git a/alc/alconfig.cpp b/alc/alconfig.cpp
index 634679aa..5e00c054 100644
--- a/alc/alconfig.cpp
+++ b/alc/alconfig.cpp
@@ -40,7 +40,7 @@
#include "alfstream.h"
#include "alstring.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "strutils.h"
#include "vector.h"
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index fe19be04..1153b99a 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -42,7 +42,7 @@
#include "alnumeric.h"
#include "aloptional.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
#include "ringbuffer.h"
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index 72f9c47a..3c6c5615 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -46,8 +46,8 @@
#include "alcmain.h"
#include "alu.h"
-#include "compat.h"
#include "comptr.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
#include "ringbuffer.h"
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index cf52e7a4..fe86f08c 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -34,7 +34,7 @@
#include "alcmain.h"
#include "alu.h"
#include "alconfig.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
#include "ringbuffer.h"
diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp
index bf267163..d3dfc3a4 100644
--- a/alc/backends/null.cpp
+++ b/alc/backends/null.cpp
@@ -33,7 +33,7 @@
#include "alcmain.h"
#include "almalloc.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "threads.h"
diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp
index cae17ce1..8e5c2783 100644
--- a/alc/backends/opensl.cpp
+++ b/alc/backends/opensl.cpp
@@ -35,7 +35,7 @@
#include "albit.h"
#include "alcmain.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "opthelpers.h"
#include "ringbuffer.h"
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 3db80961..22289b74 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -48,7 +48,7 @@
#include "alnumeric.h"
#include "aloptional.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
#include "threads.h"
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index 0011c1c7..bf3fc18e 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -38,7 +38,7 @@
#include "alcmain.h"
#include "alu.h"
#include "alconfig.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "dynload.h"
#include "strutils.h"
diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp
index f5dbdcb2..35b7e6c8 100644
--- a/alc/backends/sndio.cpp
+++ b/alc/backends/sndio.cpp
@@ -31,7 +31,7 @@
#include "alcmain.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
#include "threads.h"
diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp
index 68ab814c..7739cba7 100644
--- a/alc/backends/solaris.cpp
+++ b/alc/backends/solaris.cpp
@@ -43,7 +43,7 @@
#include "albyte.h"
#include "alu.h"
#include "alconfig.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "threads.h"
#include "vector.h"
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 6e54fa48..4df64e73 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -58,9 +58,9 @@
#include "albit.h"
#include "alcmain.h"
#include "alu.h"
-#include "compat.h"
#include "comptr.h"
#include "converter.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
#include "strutils.h"
diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp
index e80fb3ae..00ff6ec6 100644
--- a/alc/backends/wave.cpp
+++ b/alc/backends/wave.cpp
@@ -40,7 +40,7 @@
#include "almalloc.h"
#include "alnumeric.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "opthelpers.h"
#include "strutils.h"
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index 14fda45b..693c4664 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -40,7 +40,7 @@
#include "alcmain.h"
#include "alu.h"
-#include "compat.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
#include "strutils.h"
diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp
index 6d7bc949..6030bb65 100644
--- a/alc/hrtf.cpp
+++ b/alc/hrtf.cpp
@@ -48,9 +48,9 @@
#include "alnumeric.h"
#include "aloptional.h"
#include "alspan.h"
-#include "compat.h"
#include "core/ambidefs.h"
#include "core/filters/splitter.h"
+#include "core/helpers.h"
#include "core/logging.h"
#include "math_defs.h"
#include "opthelpers.h"
diff --git a/alc/helpers.cpp b/core/helpers.cpp
index ae9ba4ba..c03c3b62 100644
--- a/alc/helpers.cpp
+++ b/core/helpers.cpp
@@ -1,25 +1,8 @@
-/**
- * OpenAL cross platform audio library
- * Copyright (C) 2011 by authors.
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * Or go to http://www.gnu.org/copyleft/lgpl.html
- */
#include "config.h"
+#include "helpers.h"
+
#include <algorithm>
#include <cerrno>
#include <cstdarg>
@@ -35,8 +18,7 @@
#include "aloptional.h"
#include "alspan.h"
#include "alstring.h"
-#include "compat.h"
-#include "core/logging.h"
+#include "logging.h"
#include "strutils.h"
#include "vector.h"
diff --git a/alc/compat.h b/core/helpers.h
index d858e5c9..f0bfcf1b 100644
--- a/alc/compat.h
+++ b/core/helpers.h
@@ -1,5 +1,5 @@
-#ifndef AL_COMPAT_H
-#define AL_COMPAT_H
+#ifndef CORE_HELPERS_H
+#define CORE_HELPERS_H
#include <string>
@@ -15,4 +15,4 @@ void SetRTPriority(void);
al::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
-#endif /* AL_COMPAT_H */
+#endif /* CORE_HELPERS_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 11:20:39 +0000