kcat
/
openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ambidefs.h to core

master
Chris Robinson 2020-12-12 10:38:24 -08:00
parent 1bb7f575f0
commit 191fe888b4
14 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -629,6 +629,8 @@ set(OPENAL_OBJS
al/state.cpp
)
set(ALC_OBJS
core/ambidefs.cpp
core/ambidefs.h
core/bs2b.cpp
core/bs2b.h
core/bsinc_defs.h
@ -657,7 +659,6 @@ set(ALC_OBJS
alc/alcontext.h
alc/ambdec.cpp
alc/ambdec.h
alc/ambidefs.h
alc/bformatdec.cpp
alc/bformatdec.h
alc/buffer_storage.cpp

2
al/source.cpp
View File

@ -53,12 +53,12 @@
#include "aloptional.h"
#include "alspan.h"
#include "alu.h"
#include "ambidefs.h"
#include "atomic.h"
#include "auxeffectslot.h"
#include "backends/base.h"
#include "bformatdec.h"
#include "buffer.h"
#include "core/ambidefs.h"
#include "core/filters/nfc.h"
#include "core/filters/splitter.h"
#include "event.h"

2
alc/alc.cpp
View File

@ -75,10 +75,10 @@
#include "alspan.h"
#include "alstring.h"
#include "alu.h"
#include "ambidefs.h"
#include "atomic.h"
#include "bformatdec.h"
#include "compat.h"
#include "core/ambidefs.h"
#include "core/bs2b.h"
#include "core/devformat.h"
#include "core/mastering.h"

2
alc/alcmain.h
View File

@ -21,8 +21,8 @@
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
#include "ambidefs.h"
#include "atomic.h"
#include "core/ambidefs.h"
#include "core/bufferline.h"
#include "core/devformat.h"
#include "core/filters/splitter.h"

2
alc/alu.cpp
View File

@ -55,9 +55,9 @@
#include "alnumeric.h"
#include "alspan.h"
#include "alstring.h"
#include "ambidefs.h"
#include "atomic.h"
#include "bformatdec.h"
#include "core/ambidefs.h"
#include "core/bs2b.h"
#include "core/bsinc_tables.h"
#include "core/devformat.h"

2
alc/alu.h
View File

@ -7,7 +7,7 @@
#include <type_traits>
#include "alspan.h"
#include "ambidefs.h"
#include "core/ambidefs.h"
#include "core/bufferline.h"
#include "core/devformat.h"

2
alc/ambdec.h
View File

@ -4,7 +4,7 @@
#include <array>
#include <string>
#include "ambidefs.h"
#include "core/ambidefs.h"
#include "vector.h"
/* Helpers to read .ambdec configuration files. */

2
alc/bformatdec.h
View File

@ -7,7 +7,7 @@
#include "almalloc.h"
#include "alspan.h"
#include "ambidefs.h"
#include "core/ambidefs.h"
#include "core/bufferline.h"
#include "core/devformat.h"
#include "core/filters/splitter.h"

2
alc/effects/chorus.cpp
View File

@ -37,7 +37,7 @@
#include "alnumeric.h"
#include "alspan.h"
#include "alu.h"
#include "ambidefs.h"
#include "core/ambidefs.h"
#include "effects/base.h"
#include "math_defs.h"
#include "opthelpers.h"

2
alc/effects/convolution.cpp
View File

@ -13,9 +13,9 @@
#include "alcontext.h"
#include "almalloc.h"
#include "alspan.h"
#include "ambidefs.h"
#include "bformatdec.h"
#include "buffer_storage.h"
#include "core/ambidefs.h"
#include "core/filters/splitter.h"
#include "effects/base.h"
#include "effectslot.h"

2
alc/hrtf.h
View File

@ -8,8 +8,8 @@
#include "almalloc.h"
#include "alspan.h"
#include "ambidefs.h"
#include "atomic.h"
#include "core/ambidefs.h"
#include "core/bufferline.h"
#include "core/filters/splitter.h"
#include "intrusive_ptr.h"

13
alc/panning.cpp
View File

@ -48,8 +48,8 @@
#include "alstring.h"
#include "alu.h"
#include "ambdec.h"
#include "ambidefs.h"
#include "bformatdec.h"
#include "core/ambidefs.h"
#include "core/bs2b.h"
#include "core/devformat.h"
#include "core/uhjfilter.h"
@ -60,17 +60,6 @@
#include "opthelpers.h"
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromN3D;
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromSN3D;
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel;
namespace {
using namespace std::placeholders;

15
core/ambidefs.cpp Normal file
View File

@ -0,0 +1,15 @@
#include "config.h"
#include "ambidefs.h"
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromN3D;
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromSN3D;
constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel;

6
alc/ambidefs.h → core/ambidefs.h
View File

@ -1,5 +1,5 @@
#ifndef AMBIDEFS_H
#define AMBIDEFS_H
#ifndef CORE_AMBIDEFS_H
#define CORE_AMBIDEFS_H
#include <array>
#include <stddef.h>
@ -132,4 +132,4 @@ struct AmbiIndex {
}};
};
#endif /* AMBIDEFS_H */
#endif /* CORE_AMBIDEFS_H */