diff options
| author | kcat <[email protected]> | 2019-01-09 17:16:28 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-09 17:16:28 -0800 |
| commit | 30184613a53c9eb013fee10403aa9cd97d4ea5e1 (patch) | |
| tree | a3dd40b59196464c12c9d8d585100c5226ffb3b2 /Alc/mixvoice.cpp | |
| parent | 8f35f464a1b3ae1b8772a4645941a1fb2fec006e (diff) | |
| parent | f7fe15e1cec05a4c9e6a6a207bdb34397086cffc (diff) | |
Merge pull request #264 from ShFil119/impr/cleanup
Cleanup continuation
Diffstat (limited to 'Alc/mixvoice.cpp')
| -rw-r--r-- | Alc/mixvoice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp index e52b330d..7d30ad12 100644 --- a/Alc/mixvoice.cpp +++ b/Alc/mixvoice.cpp @@ -20,11 +20,11 @@ #include "config.h" -#include <math.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <assert.h> +#include <cmath> +#include <cstdlib> +#include <cstring> +#include <cctype> +#include <cassert> #include <numeric> #include <algorithm> @@ -61,7 +61,7 @@ RowMixerFunc MixRowSamples = MixRow_C; static HrtfMixerFunc MixHrtfSamples = MixHrtf_C; static HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_C; -static MixerFunc SelectMixer(void) +static MixerFunc SelectMixer() { #ifdef HAVE_NEON if((CPUCapFlags&CPU_CAP_NEON)) @@ -74,7 +74,7 @@ static MixerFunc SelectMixer(void) return Mix_C; } -static RowMixerFunc SelectRowMixer(void) +static RowMixerFunc SelectRowMixer() { #ifdef HAVE_NEON if((CPUCapFlags&CPU_CAP_NEON)) @@ -87,7 +87,7 @@ static RowMixerFunc SelectRowMixer(void) return MixRow_C; } -static inline HrtfMixerFunc SelectHrtfMixer(void) +static inline HrtfMixerFunc SelectHrtfMixer() { #ifdef HAVE_NEON if((CPUCapFlags&CPU_CAP_NEON)) @@ -100,7 +100,7 @@ static inline HrtfMixerFunc SelectHrtfMixer(void) return MixHrtf_C; } -static inline HrtfMixerBlendFunc SelectHrtfBlendMixer(void) +static inline HrtfMixerBlendFunc SelectHrtfBlendMixer() { #ifdef HAVE_NEON if((CPUCapFlags&CPU_CAP_NEON)) @@ -152,7 +152,7 @@ ResamplerFunc SelectResampler(Resampler resampler) } -void aluInitMixer(void) +void aluInitMixer() { const char *str; |