diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2020-12-25 06:30:47 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2020-12-25 06:30:47 -0800 |
| commit | 20820fd01beb265722d8521ad725c3c479800273 (patch) | |
| tree | a015e542f7a39b1c9945f995e4b5ea43f05ae1d3 | |
| parent | fe9ec157fd0ea647452c4894209c4016fffac682 (diff) | |
Move the ambdec loader to core
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | alc/bformatdec.cpp | 2 | ||||
| -rw-r--r-- | alc/panning.cpp | 2 | ||||
| -rw-r--r-- | core/ambdec.cpp (renamed from alc/ambdec.cpp) | 0 | ||||
| -rw-r--r-- | core/ambdec.h (renamed from alc/ambdec.h) | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cbe7850..05d04201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -584,6 +584,8 @@ set(COMMON_OBJS # Core library routines set(CORE_OBJS + core/ambdec.cpp + core/ambdec.h core/ambidefs.cpp core/ambidefs.h core/bs2b.cpp @@ -659,8 +661,6 @@ set(ALC_OBJS alc/alconfig.cpp alc/alconfig.h alc/alcontext.h - alc/ambdec.cpp - alc/ambdec.h alc/async_event.h alc/bformatdec.cpp alc/bformatdec.h diff --git a/alc/bformatdec.cpp b/alc/bformatdec.cpp index c47a042f..b1bd8981 100644 --- a/alc/bformatdec.cpp +++ b/alc/bformatdec.cpp @@ -12,7 +12,7 @@ #include "almalloc.h" #include "alu.h" -#include "ambdec.h" +#include "core/ambdec.h" #include "core/filters/splitter.h" #include "front_stablizer.h" #include "math_defs.h" diff --git a/alc/panning.cpp b/alc/panning.cpp index cb77199f..456f6bef 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -47,8 +47,8 @@ #include "alspan.h" #include "alstring.h" #include "alu.h" -#include "ambdec.h" #include "bformatdec.h" +#include "core/ambdec.h" #include "core/ambidefs.h" #include "core/bs2b.h" #include "core/devformat.h" diff --git a/alc/ambdec.cpp b/core/ambdec.cpp index a50d6d95..a50d6d95 100644 --- a/alc/ambdec.cpp +++ b/core/ambdec.cpp diff --git a/alc/ambdec.h b/core/ambdec.h index c96ded5b..9f0db6b5 100644 --- a/alc/ambdec.h +++ b/core/ambdec.h @@ -1,5 +1,5 @@ -#ifndef AMBDEC_H -#define AMBDEC_H +#ifndef CORE_AMBDEC_H +#define CORE_AMBDEC_H #include <array> #include <string> @@ -45,4 +45,4 @@ struct AmbDecConf { int load(const char *fname) noexcept; }; -#endif /* AMBDEC_H */ +#endif /* CORE_AMBDEC_H */ |