diff options
| -rw-r--r-- | alc/ambidefs.h | 2 | ||||
| -rw-r--r-- | alc/devformat.h | 2 | ||||
| -rw-r--r-- | alc/hrtf.cpp | 18 | ||||
| -rw-r--r-- | alc/hrtf.h | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/alc/ambidefs.h b/alc/ambidefs.h index 5a34804d..8d4b96ca 100644 --- a/alc/ambidefs.h +++ b/alc/ambidefs.h @@ -27,7 +27,7 @@ constexpr inline size_t AmbiChannelsFromOrder(size_t order) noexcept * channels are used/needed, there's no height (e.g. with most surround sound * speaker setups). This is ACN ordering, with bit 0 being ACN 0, etc. */ -#define AMBI_PERIPHONIC_MASK (0xfe7ce4) +#define AMBI_PERIPHONIC_MASK 0xfe7ce4 /* The maximum number of ambisonic channels for 2D (non-periphonic) * representation. This is 2 per each order above zero-order, plus 1 for zero- diff --git a/alc/devformat.h b/alc/devformat.h index 698ae72d..f08dc182 100644 --- a/alc/devformat.h +++ b/alc/devformat.h @@ -58,7 +58,7 @@ enum DevFmtChannels : ALenum { DevFmtChannelsDefault = DevFmtStereo }; -#define MAX_OUTPUT_CHANNELS (16) +#define MAX_OUTPUT_CHANNELS 16 /* DevFmtType traits, providing the type, etc given a DevFmtType. */ template<DevFmtType T> diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp index 05803865..5633c82c 100644 --- a/alc/hrtf.cpp +++ b/alc/hrtf.cpp @@ -73,22 +73,22 @@ struct LoadedHrtf { /* Data set limits must be the same as or more flexible than those defined in * the makemhr utility. */ -#define MIN_FD_COUNT (1) -#define MAX_FD_COUNT (16) +#define MIN_FD_COUNT 1 +#define MAX_FD_COUNT 16 -#define MIN_FD_DISTANCE (50) -#define MAX_FD_DISTANCE (2500) +#define MIN_FD_DISTANCE 50 +#define MAX_FD_DISTANCE 2500 -#define MIN_EV_COUNT (5) -#define MAX_EV_COUNT (181) +#define MIN_EV_COUNT 5 +#define MAX_EV_COUNT 181 -#define MIN_AZ_COUNT (1) -#define MAX_AZ_COUNT (255) +#define MIN_AZ_COUNT 1 +#define MAX_AZ_COUNT 255 #define MAX_HRIR_DELAY (HRTF_HISTORY_LENGTH-1) #define HRIR_DELAY_FRACBITS 2 -#define HRIR_DELAY_FRACONE (1<<HRIR_DELAY_FRACBITS) +#define HRIR_DELAY_FRACONE (1<<HRIR_DELAY_FRACBITS) #define HRIR_DELAY_FRACHALF (HRIR_DELAY_FRACONE>>1) static_assert(MAX_HRIR_DELAY*HRIR_DELAY_FRACONE < 256, "MAX_HRIR_DELAY or DELAY_FRAC too large"); @@ -18,15 +18,15 @@ #include "vector.h" -#define HRTF_HISTORY_BITS (6) +#define HRTF_HISTORY_BITS 6 #define HRTF_HISTORY_LENGTH (1<<HRTF_HISTORY_BITS) #define HRTF_HISTORY_MASK (HRTF_HISTORY_LENGTH-1) -#define HRIR_BITS (7) +#define HRIR_BITS 7 #define HRIR_LENGTH (1<<HRIR_BITS) #define HRIR_MASK (HRIR_LENGTH-1) -#define MIN_IR_LENGTH (8) +#define MIN_IR_LENGTH 8 using float2 = std::array<float,2>; using HrirArray = std::array<float2,HRIR_LENGTH>; |