Move the config function declarations to their own header

And rename alcConfig.c to alconfig.c for consistency.

15 files changed, 30 insertions, 11 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 34cb63d4..5297af30 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -40,6 +40,7 @@
 #include "mastering.h"
 #include "bformatdec.h"
 #include "alu.h"
+#include "alconfig.h"
 
 #include "cpu_caps.h"
 #include "compat.h"
diff --git a/Alc/alcConfig.c b/Alc/alconfig.c
index 6fd01746..1115bf30 100644
--- a/Alc/alcConfig.c
+++ b/Alc/alconfig.c
@@ -38,6 +38,7 @@
 #endif
 
 #include "alMain.h"
+#include "alconfig.h"
 #include "compat.h"
 #include "bool.h"
 
diff --git a/Alc/alconfig.h b/Alc/alconfig.h
new file mode 100644
index 00000000..1e493e2e
--- /dev/null
+++ b/Alc/alconfig.h
@@ -0,0 +1,17 @@
+#ifndef ALCONFIG_H
+#define ALCONFIG_H
+
+void ReadALConfig(void);
+void FreeALConfig(void);
+
+int ConfigValueExists(const char *devName, const char *blockName, const char *keyName);
+const char *GetConfigValue(const char *devName, const char *blockName, const char *keyName, const char *def);
+int GetConfigValueBool(const char *devName, const char *blockName, const char *keyName, int def);
+
+int ConfigValueStr(const char *devName, const char *blockName, const char *keyName, const char **ret);
+int ConfigValueInt(const char *devName, const char *blockName, const char *keyName, int *ret);
+int ConfigValueUInt(const char *devName, const char *blockName, const char *keyName, unsigned int *ret);
+int ConfigValueFloat(const char *devName, const char *blockName, const char *keyName, float *ret);
+int ConfigValueBool(const char *devName, const char *blockName, const char *keyName, int *ret);
+
+#endif /* ALCONFIG_H */
diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c
index 79f2795a..f941ce4b 100644
--- a/Alc/backends/alsa.c
+++ b/Alc/backends/alsa.c
@@ -26,6 +26,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/backends/jack.c b/Alc/backends/jack.c
index ceff0b3a..4ef9006c 100644
--- a/Alc/backends/jack.c
+++ b/Alc/backends/jack.c
@@ -26,6 +26,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c
index 9c63d9d2..196432e1 100644
--- a/Alc/backends/oss.c
+++ b/Alc/backends/oss.c
@@ -35,6 +35,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index 807e8000..0f4672c4 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -26,6 +26,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "compat.h"
 
 #include "backends/base.h"
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c
index 8c5469b2..9f3c4762 100644
--- a/Alc/backends/pulseaudio.c
+++ b/Alc/backends/pulseaudio.c
@@ -25,6 +25,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c
index 5dfb5084..59cc5ddc 100644
--- a/Alc/backends/solaris.c
+++ b/Alc/backends/solaris.c
@@ -34,6 +34,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index bdf76edc..1c502fd9 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -27,6 +27,7 @@
 
 #include "alMain.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "threads.h"
 #include "compat.h"
 
diff --git a/Alc/hrtf.c b/Alc/hrtf.c
index 54537a05..9d5e2ca9 100644
--- a/Alc/hrtf.c
+++ b/Alc/hrtf.c
@@ -30,6 +30,7 @@
 #include "alu.h"
 #include "bformatdec.h"
 #include "hrtf.h"
+#include "alconfig.h"
 
 #include "compat.h"
 #include "almalloc.h"
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 3d1da58f..b1d859c6 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -34,6 +34,7 @@
 #include "alListener.h"
 #include "alAuxEffectSlot.h"
 #include "alu.h"
+#include "alconfig.h"
 
 #include "cpu_caps.h"
 #include "mixer_defs.h"
diff --git a/Alc/panning.c b/Alc/panning.c
index 37bf3ac9..dfb71918 100644
--- a/Alc/panning.c
+++ b/Alc/panning.c
@@ -29,6 +29,7 @@
 #include "alMain.h"
 #include "alAuxEffectSlot.h"
 #include "alu.h"
+#include "alconfig.h"
 #include "bool.h"
 #include "ambdec.h"
 #include "bformatdec.h"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95b73c25..929b5517 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -713,7 +713,7 @@ SET(OPENAL_OBJS  OpenAL32/alAuxEffectSlot.c
 )
 SET(ALC_OBJS  Alc/ALc.c
               Alc/ALu.c
-              Alc/alcConfig.c
+              Alc/alconfig.c
               Alc/alcRing.c
               Alc/bs2b.c
               Alc/converter.c
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 6556da37..ea797053 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -850,16 +850,6 @@ size_t ll_ringbuffer_write(ll_ringbuffer_t *rb, const char *src, size_t cnt);
 void ll_ringbuffer_write_advance(ll_ringbuffer_t *rb, size_t cnt);
 size_t ll_ringbuffer_write_space(const ll_ringbuffer_t *rb);
 
-void ReadALConfig(void);
-void FreeALConfig(void);
-int ConfigValueExists(const char *devName, const char *blockName, const char *keyName);
-const char *GetConfigValue(const char *devName, const char *blockName, const char *keyName, const char *def);
-int GetConfigValueBool(const char *devName, const char *blockName, const char *keyName, int def);
-int ConfigValueStr(const char *devName, const char *blockName, const char *keyName, const char **ret);
-int ConfigValueInt(const char *devName, const char *blockName, const char *keyName, int *ret);
-int ConfigValueUInt(const char *devName, const char *blockName, const char *keyName, unsigned int *ret);
-int ConfigValueFloat(const char *devName, const char *blockName, const char *keyName, float *ret);
-int ConfigValueBool(const char *devName, const char *blockName, const char *keyName, int *ret);
 
 void SetRTPriority(void);