diff options
| author | Chris Robinson <[email protected]> | 2020-12-13 21:12:03 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2020-12-13 21:12:03 -0800 |
| commit | 56af137ba0a3ab847b8f57c3c4aeee606aa5403f (patch) | |
| tree | 7750cfda8fc860d6d2c80b505db08852ed25575b | |
| parent | 783904e414024691d47e76a22d8405ca85dd04f2 (diff) | |
Move fmt_traits to core
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | alc/effects/convolution.cpp | 2 | ||||
| -rw-r--r-- | alc/voice.cpp | 2 | ||||
| -rw-r--r-- | core/fmt_traits.cpp (renamed from alc/fmt_traits.cpp) | 0 | ||||
| -rw-r--r-- | core/fmt_traits.h (renamed from alc/fmt_traits.h) | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index df5fa66f..13876def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -602,6 +602,8 @@ set(CORE_OBJS core/filters/nfc.h core/filters/splitter.cpp core/filters/splitter.h + core/fmt_traits.cpp + core/fmt_traits.h core/mastering.cpp core/mastering.h core/uhjfilter.cpp @@ -683,8 +685,6 @@ set(ALC_OBJS alc/effects/pshifter.cpp alc/effects/reverb.cpp alc/effects/vmorpher.cpp - alc/fmt_traits.cpp - alc/fmt_traits.h alc/fpu_ctrl.cpp alc/fpu_ctrl.h alc/front_stablizer.h diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index b190e75e..677c59ba 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -17,9 +17,9 @@ #include "buffer_storage.h" #include "core/ambidefs.h" #include "core/filters/splitter.h" +#include "core/fmt_traits.h" #include "effects/base.h" #include "effectslot.h" -#include "fmt_traits.h" #include "logging.h" #include "polyphase_resampler.h" diff --git a/alc/voice.cpp b/alc/voice.cpp index 8aa5a59f..8b4e0c2e 100644 --- a/alc/voice.cpp +++ b/alc/voice.cpp @@ -50,10 +50,10 @@ #include "core/filters/biquad.h" #include "core/filters/nfc.h" #include "core/filters/splitter.h" +#include "core/fmt_traits.h" #include "core/mixer/defs.h" #include "core/mixer/hrtfdefs.h" #include "cpu_caps.h" -#include "fmt_traits.h" #include "hrtf.h" #include "inprogext.h" #include "logging.h" diff --git a/alc/fmt_traits.cpp b/core/fmt_traits.cpp index 054d8766..054d8766 100644 --- a/alc/fmt_traits.cpp +++ b/core/fmt_traits.cpp diff --git a/alc/fmt_traits.h b/core/fmt_traits.h index 9d2a2567..f797f836 100644 --- a/alc/fmt_traits.h +++ b/core/fmt_traits.h @@ -1,8 +1,8 @@ -#ifndef ALC_FMT_TRAITS_H -#define ALC_FMT_TRAITS_H +#ifndef CORE_FMT_TRAITS_H +#define CORE_FMT_TRAITS_H -#include <cstddef> -#include <cstdint> +#include <stddef.h> +#include <stdint.h> #include "albyte.h" #include "buffer_storage.h" @@ -78,4 +78,4 @@ inline void LoadSampleArray(DstT *RESTRICT dst, const al::byte *src, const size_ } // namespace al -#endif /* ALC_FMT_TRAITS_H */ +#endif /* CORE_FMT_TRAITS_H */ |