diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | alc/backends/coreaudio.cpp | 2 | ||||
| -rw-r--r-- | alc/backends/wasapi.cpp | 2 | ||||
| -rw-r--r-- | core/converter.cpp (renamed from alc/converter.cpp) | 2 | ||||
| -rw-r--r-- | core/converter.h (renamed from alc/converter.h) | 10 | ||||
| -rw-r--r-- | core/uiddefs.cpp (renamed from alc/uiddefs.cpp) | 0 |
6 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15feb2b9..13d7ee54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -651,6 +651,8 @@ set(CORE_OBJS core/bsinc_tables.cpp core/bsinc_tables.h core/bufferline.h + core/converter.cpp + core/converter.h core/cpu_caps.cpp core/cpu_caps.h core/devformat.cpp @@ -677,7 +679,8 @@ set(CORE_OBJS core/mastering.h core/resampler_limits.h core/uhjfilter.cpp - core/uhjfilter.h) + core/uhjfilter.h + core/uiddefs.cpp) set(HAVE_RTKIT 0) option(ALSOFT_REQUIRE_RTKIT "Require RTKit/D-Bus support" FALSE) @@ -755,8 +758,6 @@ set(ALC_OBJS alc/bformatdec.h alc/buffer_storage.cpp alc/buffer_storage.h - alc/converter.cpp - alc/converter.h alc/effectslot.cpp alc/effectslot.h alc/effects/base.h @@ -777,7 +778,6 @@ set(ALC_OBJS alc/front_stablizer.h alc/inprogext.h alc/panning.cpp - alc/uiddefs.cpp alc/voice.cpp alc/voice.h alc/voice_change.h) diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp index 43c78063..0dd8e766 100644 --- a/alc/backends/coreaudio.cpp +++ b/alc/backends/coreaudio.cpp @@ -32,7 +32,7 @@ #include "alcmain.h" #include "alu.h" #include "ringbuffer.h" -#include "converter.h" +#include "core/converter.h" #include "core/logging.h" #include "backends/base.h" diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp index 4df64e73..76c6d009 100644 --- a/alc/backends/wasapi.cpp +++ b/alc/backends/wasapi.cpp @@ -59,7 +59,7 @@ #include "alcmain.h" #include "alu.h" #include "comptr.h" -#include "converter.h" +#include "core/converter.h" #include "core/helpers.h" #include "core/logging.h" #include "ringbuffer.h" diff --git a/alc/converter.cpp b/core/converter.cpp index f7d4fc46..6a06b464 100644 --- a/alc/converter.cpp +++ b/core/converter.cpp @@ -12,7 +12,7 @@ #include "albit.h" #include "albyte.h" #include "alnumeric.h" -#include "core/fpu_ctrl.h" +#include "fpu_ctrl.h" struct CTag; struct CopyTag; diff --git a/alc/converter.h b/core/converter.h index ffcfbc18..2d22ae38 100644 --- a/alc/converter.h +++ b/core/converter.h @@ -1,12 +1,12 @@ -#ifndef CONVERTER_H -#define CONVERTER_H +#ifndef CORE_CONVERTER_H +#define CORE_CONVERTER_H #include <cstddef> #include <memory> #include "almalloc.h" -#include "core/devformat.h" -#include "core/mixer/defs.h" +#include "devformat.h" +#include "mixer/defs.h" using uint = unsigned int; @@ -56,4 +56,4 @@ struct ChannelConverter { void convert(const void *src, float *dst, uint frames) const; }; -#endif /* CONVERTER_H */ +#endif /* CORE_CONVERTER_H */ diff --git a/alc/uiddefs.cpp b/core/uiddefs.cpp index 244c01a5..244c01a5 100644 --- a/alc/uiddefs.cpp +++ b/core/uiddefs.cpp |