Move helpers.cpp to core

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

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"

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"

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"

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"

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"

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"
 
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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 */