diff options
32 files changed, 19 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa9e7d37..86489991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,8 +554,6 @@ set(COMMON_OBJS common/albyte.h common/alcomplex.cpp common/alcomplex.h - common/alexcpt.cpp - common/alexcpt.h common/alfstream.cpp common/alfstream.h common/almalloc.cpp @@ -596,6 +594,8 @@ set(CORE_OBJS core/bufferline.h core/devformat.cpp core/devformat.h + core/except.cpp + core/except.h core/filters/biquad.h core/filters/biquad.cpp core/filters/nfc.cpp diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp index a69df77a..e3e8a125 100644 --- a/al/auxeffectslot.cpp +++ b/al/auxeffectslot.cpp @@ -36,12 +36,12 @@ #include "alcmain.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" #include "alu.h" #include "buffer.h" +#include "core/except.h" #include "core/logging.h" #include "effect.h" #include "fpu_ctrl.h" diff --git a/al/buffer.cpp b/al/buffer.cpp index 0ee6b808..cdbedf70 100644 --- a/al/buffer.cpp +++ b/al/buffer.cpp @@ -44,11 +44,11 @@ #include "albyte.h" #include "alcmain.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" #include "atomic.h" +#include "core/except.h" #include "inprogext.h" #include "opthelpers.h" diff --git a/al/effect.cpp b/al/effect.cpp index 029ecaa8..7ddf9664 100644 --- a/al/effect.cpp +++ b/al/effect.cpp @@ -40,10 +40,10 @@ #include "alcmain.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "alstring.h" +#include "core/except.h" #include "core/logging.h" #include "effects/base.h" #include "opthelpers.h" diff --git a/al/effects/effects.h b/al/effects/effects.h index 47b089ba..d6c88c4f 100644 --- a/al/effects/effects.h +++ b/al/effects/effects.h @@ -3,7 +3,7 @@ #include "AL/al.h" -#include "alexcpt.h" +#include "core/except.h" union EffectProps; diff --git a/al/error.cpp b/al/error.cpp index f9c408d2..444b55aa 100644 --- a/al/error.cpp +++ b/al/error.cpp @@ -36,8 +36,8 @@ #include "AL/alc.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" +#include "core/except.h" #include "core/logging.h" #include "opthelpers.h" #include "vector.h" diff --git a/al/event.cpp b/al/event.cpp index 6834253a..7267625d 100644 --- a/al/event.cpp +++ b/al/event.cpp @@ -19,9 +19,9 @@ #include "albyte.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "async_event.h" +#include "core/except.h" #include "core/logging.h" #include "effects/base.h" #include "inprogext.h" diff --git a/al/extension.cpp b/al/extension.cpp index 35c53136..7346a5c6 100644 --- a/al/extension.cpp +++ b/al/extension.cpp @@ -28,8 +28,8 @@ #include "AL/alc.h" #include "alcontext.h" -#include "alexcpt.h" #include "alstring.h" +#include "core/except.h" #include "opthelpers.h" diff --git a/al/filter.cpp b/al/filter.cpp index 2f49c52e..e549b1c9 100644 --- a/al/filter.cpp +++ b/al/filter.cpp @@ -38,9 +38,9 @@ #include "alcmain.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" +#include "core/except.h" #include "opthelpers.h" #include "vector.h" diff --git a/al/listener.cpp b/al/listener.cpp index cef96fb0..4bbc145c 100644 --- a/al/listener.cpp +++ b/al/listener.cpp @@ -30,9 +30,9 @@ #include "AL/efx.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "atomic.h" +#include "core/except.h" #include "opthelpers.h" diff --git a/al/source.cpp b/al/source.cpp index 5fae7b54..fa7665c4 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -47,7 +47,6 @@ #include "alcmain.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" @@ -59,6 +58,7 @@ #include "bformatdec.h" #include "buffer.h" #include "core/ambidefs.h" +#include "core/except.h" #include "core/filters/nfc.h" #include "core/filters/splitter.h" #include "core/logging.h" diff --git a/al/state.cpp b/al/state.cpp index c8eebbe0..026f2808 100644 --- a/al/state.cpp +++ b/al/state.cpp @@ -33,12 +33,12 @@ #include "AL/alext.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "alspan.h" #include "alu.h" #include "atomic.h" +#include "core/except.h" #include "event.h" #include "inprogext.h" #include "opthelpers.h" diff --git a/alc/alc.cpp b/alc/alc.cpp index 8cda3733..1b06b57f 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -68,7 +68,6 @@ #include "albyte.h" #include "alconfig.h" #include "alcontext.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" @@ -82,6 +81,7 @@ #include "core/ambidefs.h" #include "core/bs2b.h" #include "core/devformat.h" +#include "core/except.h" #include "core/mastering.h" #include "core/filters/nfc.h" #include "core/filters/splitter.h" diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp index 4adf64b3..f8b22aaf 100644 --- a/alc/backends/alsa.cpp +++ b/alc/backends/alsa.cpp @@ -40,7 +40,6 @@ #include "albyte.h" #include "alcmain.h" #include "alconfig.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" diff --git a/alc/backends/base.cpp b/alc/backends/base.cpp index 60d99bff..8642f40c 100644 --- a/alc/backends/base.cpp +++ b/alc/backends/base.cpp @@ -13,7 +13,6 @@ #endif #include "alcmain.h" -#include "alexcpt.h" #include "alnumeric.h" #include "aloptional.h" #include "atomic.h" diff --git a/alc/backends/base.h b/alc/backends/base.h index 963d01a4..df076276 100644 --- a/alc/backends/base.h +++ b/alc/backends/base.h @@ -8,7 +8,7 @@ #include "albyte.h" #include "alcmain.h" -#include "alexcpt.h" +#include "core/except.h" using uint = unsigned int; diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp index a4c93819..8e38a777 100644 --- a/alc/backends/coreaudio.cpp +++ b/alc/backends/coreaudio.cpp @@ -30,7 +30,6 @@ #include <cmath> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "ringbuffer.h" #include "converter.h" diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp index a8577dbc..a09def73 100644 --- a/alc/backends/dsound.cpp +++ b/alc/backends/dsound.cpp @@ -45,7 +45,6 @@ #include <functional> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "compat.h" #include "core/logging.h" diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp index c70e5b0d..7c9573ce 100644 --- a/alc/backends/jack.cpp +++ b/alc/backends/jack.cpp @@ -34,7 +34,6 @@ #include "alcmain.h" #include "alu.h" #include "alconfig.h" -#include "alexcpt.h" #include "core/logging.h" #include "dynload.h" #include "ringbuffer.h" diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp index 87fb2689..15a36ddd 100644 --- a/alc/backends/null.cpp +++ b/alc/backends/null.cpp @@ -31,7 +31,6 @@ #include <thread> #include "alcmain.h" -#include "alexcpt.h" #include "almalloc.h" #include "alu.h" #include "threads.h" diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp index b41a4d84..8d966fca 100644 --- a/alc/backends/opensl.cpp +++ b/alc/backends/opensl.cpp @@ -33,7 +33,6 @@ #include <functional> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "compat.h" #include "core/logging.h" diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp index 1178a3ac..b333432d 100644 --- a/alc/backends/oss.cpp +++ b/alc/backends/oss.cpp @@ -46,7 +46,6 @@ #include "alcmain.h" #include "alconfig.h" #include "albyte.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "aloptional.h" diff --git a/alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp index 4cb9fe0a..d2e6a5a4 100644 --- a/alc/backends/portaudio.cpp +++ b/alc/backends/portaudio.cpp @@ -27,7 +27,6 @@ #include <cstring> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "alconfig.h" #include "core/logging.h" diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp index 9e5424de..8c65460f 100644 --- a/alc/backends/pulseaudio.cpp +++ b/alc/backends/pulseaudio.cpp @@ -38,7 +38,6 @@ #include "alcmain.h" #include "alu.h" #include "alconfig.h" -#include "alexcpt.h" #include "compat.h" #include "core/logging.h" #include "dynload.h" diff --git a/alc/backends/sdl2.cpp b/alc/backends/sdl2.cpp index 300f4934..58045c85 100644 --- a/alc/backends/sdl2.cpp +++ b/alc/backends/sdl2.cpp @@ -30,7 +30,6 @@ #include "AL/al.h" #include "alcmain.h" -#include "alexcpt.h" #include "almalloc.h" #include "alu.h" #include "core/logging.h" diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp index 258eda19..41bdb73b 100644 --- a/alc/backends/sndio.cpp +++ b/alc/backends/sndio.cpp @@ -30,7 +30,6 @@ #include <functional> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp index 6a2c2da0..f2763357 100644 --- a/alc/backends/solaris.cpp +++ b/alc/backends/solaris.cpp @@ -40,7 +40,6 @@ #include "alcmain.h" #include "albyte.h" -#include "alexcpt.h" #include "alu.h" #include "alconfig.h" #include "compat.h" diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp index 45359bf6..a0eb814f 100644 --- a/alc/backends/wasapi.cpp +++ b/alc/backends/wasapi.cpp @@ -56,7 +56,6 @@ #include <vector> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "compat.h" #include "converter.h" diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp index 7e076e47..b870ea67 100644 --- a/alc/backends/wave.cpp +++ b/alc/backends/wave.cpp @@ -38,7 +38,6 @@ #include "albyte.h" #include "alcmain.h" #include "alconfig.h" -#include "alexcpt.h" #include "almalloc.h" #include "alnumeric.h" #include "alu.h" diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp index 2474a316..9b88f12e 100644 --- a/alc/backends/winmm.cpp +++ b/alc/backends/winmm.cpp @@ -39,7 +39,6 @@ #include <functional> #include "alcmain.h" -#include "alexcpt.h" #include "alu.h" #include "compat.h" #include "core/logging.h" diff --git a/common/alexcpt.cpp b/core/except.cpp index 6fbc63fd..07bb410a 100644 --- a/common/alexcpt.cpp +++ b/core/except.cpp @@ -1,7 +1,7 @@ #include "config.h" -#include "alexcpt.h" +#include "except.h" #include <cstdio> #include <cstdarg> diff --git a/common/alexcpt.h b/core/except.h index e31c50e7..0e28e9df 100644 --- a/common/alexcpt.h +++ b/core/except.h @@ -1,5 +1,5 @@ -#ifndef ALEXCPT_H -#define ALEXCPT_H +#ifndef CORE_EXCEPT_H +#define CORE_EXCEPT_H #include <cstdarg> #include <exception> @@ -28,4 +28,4 @@ public: #define END_API_FUNC catch(...) { std::terminate(); } -#endif /* ALEXCPT_H */ +#endif /* CORE_EXCEPT_H */ |