Rename alcmain.h to device.h

8 files changed, 16 insertions, 31 deletions

diff --git a/alc/alc.cpp b/alc/alc.cpp
index 1f7b999d..9eface89 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -66,7 +66,6 @@
 #include "al/listener.h"
 #include "al/source.h"
 #include "albit.h"
-#include "alcmain.h"
 #include "albyte.h"
 #include "alconfig.h"
 #include "alcontext.h"
@@ -94,6 +93,7 @@
 #include "core/logging.h"
 #include "core/uhjfilter.h"
 #include "core/voice_change.h"
+#include "device.h"
 #include "effects/base.h"
 #include "inprogext.h"
 #include "intrusive_ptr.h"
diff --git a/alc/backends/sdl2.cpp b/alc/backends/sdl2.cpp
index 800ae935..fe8ece31 100644
--- a/alc/backends/sdl2.cpp
+++ b/alc/backends/sdl2.cpp
@@ -20,16 +20,15 @@
 
 #include "config.h"
 
-#include "backends/sdl2.h"
+#include "sdl2.h"
 
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
 #include <string>
 
-#include "alcmain.h"
 #include "almalloc.h"
-#include "alu.h"
+#include "core/device.h"
 #include "core/logging.h"
 
 #include <SDL2/SDL.h>
diff --git a/alc/backends/sdl2.h b/alc/backends/sdl2.h
index 3844b8bf..3bd8df86 100644
--- a/alc/backends/sdl2.h
+++ b/alc/backends/sdl2.h
@@ -1,7 +1,7 @@
 #ifndef BACKENDS_SDL2_H
 #define BACKENDS_SDL2_H
 
-#include "backends/base.h"
+#include "base.h"
 
 struct SDL2BackendFactory final : public BackendFactory {
 public:
diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp
index 20414543..26f5a5c5 100644
--- a/alc/backends/solaris.cpp
+++ b/alc/backends/solaris.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "backends/solaris.h"
+#include "solaris.h"
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -39,10 +39,9 @@
 #include <thread>
 #include <functional>
 
-#include "alcmain.h"
 #include "albyte.h"
-#include "alu.h"
-#include "alconfig.h"
+#include "alc/alconfig.h"
+#include "core/device.h"
 #include "core/helpers.h"
 #include "core/logging.h"
 #include "threads.h"
diff --git a/alc/backends/solaris.h b/alc/backends/solaris.h
index 4e80cf9a..5da6ad3a 100644
--- a/alc/backends/solaris.h
+++ b/alc/backends/solaris.h
@@ -1,7 +1,7 @@
 #ifndef BACKENDS_SOLARIS_H
 #define BACKENDS_SOLARIS_H
 
-#include "backends/base.h"
+#include "base.h"
 
 struct SolarisBackendFactory final : public BackendFactory {
 public:
diff --git a/alc/device.cpp b/alc/device.cpp
new file mode 100644
index 00000000..954a790b
--- /dev/null
+++ b/alc/device.cpp
@@ -0,0 +1,4 @@
+
+#include "config.h"
+
+#include "device.h"
diff --git a/alc/alcmain.h b/alc/device.h
index eb25b596..2f465b16 100644
--- a/alc/alcmain.h
+++ b/alc/device.h
@@ -1,35 +1,18 @@
-#ifndef ALC_MAIN_H
-#define ALC_MAIN_H
+#ifndef ALC_DEVICE_H
+#define ALC_DEVICE_H
 
-#include <algorithm>
-#include <array>
 #include <atomic>
-#include <bitset>
-#include <chrono>
-#include <cstdint>
-#include <cstddef>
-#include <memory>
 #include <mutex>
+#include <stdint.h>
 #include <string>
-#include <thread>
 #include <utility>
 
-#include "AL/al.h"
 #include "AL/alc.h"
 #include "AL/alext.h"
 
 #include "almalloc.h"
 #include "alnumeric.h"
-#include "alspan.h"
-#include "atomic.h"
-#include "core/ambidefs.h"
-#include "core/bufferline.h"
-#include "core/devformat.h"
 #include "core/device.h"
-#include "core/filters/splitter.h"
-#include "core/hrtf.h"
-#include "core/mixer/defs.h"
-#include "inprogext.h"
 #include "intrusive_ptr.h"
 #include "vector.h"
 
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 5e263111..00fe9023 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -38,7 +38,6 @@
 #include "AL/alext.h"
 
 #include "al/auxeffectslot.h"
-#include "alcmain.h"
 #include "alconfig.h"
 #include "alcontext.h"
 #include "almalloc.h"
@@ -56,6 +55,7 @@
 #include "core/hrtf.h"
 #include "core/logging.h"
 #include "core/uhjfilter.h"
+#include "device.h"
 #include "math_defs.h"
 #include "opthelpers.h"