From cb3e96e75640730b9391f0d2d922eecd9ee2ce79 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 28 Jul 2019 18:56:04 -0700 Subject: [PATCH] Rename Alc to alc --- CMakeLists.txt | 172 +++++++++++++-------------- {Alc => alc}/alc.cpp | 0 {Alc => alc}/alcmain.h | 0 {Alc => alc}/alconfig.cpp | 0 {Alc => alc}/alconfig.h | 0 {Alc => alc}/alcontext.h | 0 {Alc => alc}/alu.cpp | 0 {Alc => alc}/alu.h | 0 {Alc => alc}/ambdec.cpp | 0 {Alc => alc}/ambdec.h | 0 {Alc => alc}/ambidefs.h | 0 {Alc => alc}/backends/alsa.cpp | 0 {Alc => alc}/backends/alsa.h | 0 {Alc => alc}/backends/base.cpp | 0 {Alc => alc}/backends/base.h | 0 {Alc => alc}/backends/coreaudio.cpp | 0 {Alc => alc}/backends/coreaudio.h | 0 {Alc => alc}/backends/dsound.cpp | 0 {Alc => alc}/backends/dsound.h | 0 {Alc => alc}/backends/jack.cpp | 0 {Alc => alc}/backends/jack.h | 0 {Alc => alc}/backends/loopback.cpp | 0 {Alc => alc}/backends/loopback.h | 0 {Alc => alc}/backends/null.cpp | 0 {Alc => alc}/backends/null.h | 0 {Alc => alc}/backends/opensl.cpp | 0 {Alc => alc}/backends/opensl.h | 0 {Alc => alc}/backends/oss.cpp | 0 {Alc => alc}/backends/oss.h | 0 {Alc => alc}/backends/portaudio.cpp | 0 {Alc => alc}/backends/portaudio.h | 0 {Alc => alc}/backends/pulseaudio.cpp | 0 {Alc => alc}/backends/pulseaudio.h | 0 {Alc => alc}/backends/qsa.cpp | 0 {Alc => alc}/backends/qsa.h | 0 {Alc => alc}/backends/sdl2.cpp | 14 ++- {Alc => alc}/backends/sdl2.h | 0 {Alc => alc}/backends/sndio.cpp | 0 {Alc => alc}/backends/sndio.h | 0 {Alc => alc}/backends/solaris.cpp | 0 {Alc => alc}/backends/solaris.h | 0 {Alc => alc}/backends/wasapi.cpp | 0 {Alc => alc}/backends/wasapi.h | 0 {Alc => alc}/backends/wave.cpp | 0 {Alc => alc}/backends/wave.h | 0 {Alc => alc}/backends/winmm.cpp | 0 {Alc => alc}/backends/winmm.h | 0 {Alc => alc}/bformatdec.cpp | 0 {Alc => alc}/bformatdec.h | 0 {Alc => alc}/bs2b.cpp | 0 {Alc => alc}/bs2b.h | 0 {Alc => alc}/compat.h | 0 {Alc => alc}/converter.cpp | 0 {Alc => alc}/converter.h | 0 {Alc => alc}/cpu_caps.h | 0 {Alc => alc}/effects/autowah.cpp | 0 {Alc => alc}/effects/base.h | 0 {Alc => alc}/effects/chorus.cpp | 0 {Alc => alc}/effects/compressor.cpp | 0 {Alc => alc}/effects/dedicated.cpp | 0 {Alc => alc}/effects/distortion.cpp | 0 {Alc => alc}/effects/echo.cpp | 0 {Alc => alc}/effects/equalizer.cpp | 0 {Alc => alc}/effects/fshifter.cpp | 0 {Alc => alc}/effects/modulator.cpp | 0 {Alc => alc}/effects/null.cpp | 0 {Alc => alc}/effects/pshifter.cpp | 0 {Alc => alc}/effects/reverb.cpp | 0 {Alc => alc}/effects/vmorpher.cpp | 0 {Alc => alc}/filters/biquad.cpp | 0 {Alc => alc}/filters/biquad.h | 0 {Alc => alc}/filters/nfc.cpp | 0 {Alc => alc}/filters/nfc.h | 0 {Alc => alc}/filters/splitter.cpp | 0 {Alc => alc}/filters/splitter.h | 0 {Alc => alc}/fpu_modes.h | 0 {Alc => alc}/helpers.cpp | 0 {Alc => alc}/hrtf.cpp | 0 {Alc => alc}/hrtf.h | 0 {Alc => alc}/inprogext.h | 0 {Alc => alc}/logging.h | 0 {Alc => alc}/mastering.cpp | 0 {Alc => alc}/mastering.h | 0 {Alc => alc}/mixer/defs.h | 0 {Alc => alc}/mixer/hrtfbase.h | 0 {Alc => alc}/mixer/mixer_c.cpp | 0 {Alc => alc}/mixer/mixer_neon.cpp | 0 {Alc => alc}/mixer/mixer_sse.cpp | 0 {Alc => alc}/mixer/mixer_sse2.cpp | 0 {Alc => alc}/mixer/mixer_sse3.cpp | 0 {Alc => alc}/mixer/mixer_sse41.cpp | 0 {Alc => alc}/mixvoice.cpp | 0 {Alc => alc}/panning.cpp | 0 {Alc => alc}/ringbuffer.cpp | 0 {Alc => alc}/ringbuffer.h | 0 {Alc => alc}/uhjfilter.cpp | 0 {Alc => alc}/uhjfilter.h | 0 {Alc => alc}/vector.h | 0 98 files changed, 95 insertions(+), 91 deletions(-) rename {Alc => alc}/alc.cpp (100%) rename {Alc => alc}/alcmain.h (100%) rename {Alc => alc}/alconfig.cpp (100%) rename {Alc => alc}/alconfig.h (100%) rename {Alc => alc}/alcontext.h (100%) rename {Alc => alc}/alu.cpp (100%) rename {Alc => alc}/alu.h (100%) rename {Alc => alc}/ambdec.cpp (100%) rename {Alc => alc}/ambdec.h (100%) rename {Alc => alc}/ambidefs.h (100%) rename {Alc => alc}/backends/alsa.cpp (100%) rename {Alc => alc}/backends/alsa.h (100%) rename {Alc => alc}/backends/base.cpp (100%) rename {Alc => alc}/backends/base.h (100%) rename {Alc => alc}/backends/coreaudio.cpp (100%) rename {Alc => alc}/backends/coreaudio.h (100%) rename {Alc => alc}/backends/dsound.cpp (100%) rename {Alc => alc}/backends/dsound.h (100%) rename {Alc => alc}/backends/jack.cpp (100%) rename {Alc => alc}/backends/jack.h (100%) rename {Alc => alc}/backends/loopback.cpp (100%) rename {Alc => alc}/backends/loopback.h (100%) rename {Alc => alc}/backends/null.cpp (100%) rename {Alc => alc}/backends/null.h (100%) rename {Alc => alc}/backends/opensl.cpp (100%) rename {Alc => alc}/backends/opensl.h (100%) rename {Alc => alc}/backends/oss.cpp (100%) rename {Alc => alc}/backends/oss.h (100%) rename {Alc => alc}/backends/portaudio.cpp (100%) rename {Alc => alc}/backends/portaudio.h (100%) rename {Alc => alc}/backends/pulseaudio.cpp (100%) rename {Alc => alc}/backends/pulseaudio.h (100%) rename {Alc => alc}/backends/qsa.cpp (100%) rename {Alc => alc}/backends/qsa.h (100%) rename {Alc => alc}/backends/sdl2.cpp (98%) rename {Alc => alc}/backends/sdl2.h (100%) rename {Alc => alc}/backends/sndio.cpp (100%) rename {Alc => alc}/backends/sndio.h (100%) rename {Alc => alc}/backends/solaris.cpp (100%) rename {Alc => alc}/backends/solaris.h (100%) rename {Alc => alc}/backends/wasapi.cpp (100%) rename {Alc => alc}/backends/wasapi.h (100%) rename {Alc => alc}/backends/wave.cpp (100%) rename {Alc => alc}/backends/wave.h (100%) rename {Alc => alc}/backends/winmm.cpp (100%) rename {Alc => alc}/backends/winmm.h (100%) rename {Alc => alc}/bformatdec.cpp (100%) rename {Alc => alc}/bformatdec.h (100%) rename {Alc => alc}/bs2b.cpp (100%) rename {Alc => alc}/bs2b.h (100%) rename {Alc => alc}/compat.h (100%) rename {Alc => alc}/converter.cpp (100%) rename {Alc => alc}/converter.h (100%) rename {Alc => alc}/cpu_caps.h (100%) rename {Alc => alc}/effects/autowah.cpp (100%) rename {Alc => alc}/effects/base.h (100%) rename {Alc => alc}/effects/chorus.cpp (100%) rename {Alc => alc}/effects/compressor.cpp (100%) rename {Alc => alc}/effects/dedicated.cpp (100%) rename {Alc => alc}/effects/distortion.cpp (100%) rename {Alc => alc}/effects/echo.cpp (100%) rename {Alc => alc}/effects/equalizer.cpp (100%) rename {Alc => alc}/effects/fshifter.cpp (100%) rename {Alc => alc}/effects/modulator.cpp (100%) rename {Alc => alc}/effects/null.cpp (100%) rename {Alc => alc}/effects/pshifter.cpp (100%) rename {Alc => alc}/effects/reverb.cpp (100%) rename {Alc => alc}/effects/vmorpher.cpp (100%) rename {Alc => alc}/filters/biquad.cpp (100%) rename {Alc => alc}/filters/biquad.h (100%) rename {Alc => alc}/filters/nfc.cpp (100%) rename {Alc => alc}/filters/nfc.h (100%) rename {Alc => alc}/filters/splitter.cpp (100%) rename {Alc => alc}/filters/splitter.h (100%) rename {Alc => alc}/fpu_modes.h (100%) rename {Alc => alc}/helpers.cpp (100%) rename {Alc => alc}/hrtf.cpp (100%) rename {Alc => alc}/hrtf.h (100%) rename {Alc => alc}/inprogext.h (100%) rename {Alc => alc}/logging.h (100%) rename {Alc => alc}/mastering.cpp (100%) rename {Alc => alc}/mastering.h (100%) rename {Alc => alc}/mixer/defs.h (100%) rename {Alc => alc}/mixer/hrtfbase.h (100%) rename {Alc => alc}/mixer/mixer_c.cpp (100%) rename {Alc => alc}/mixer/mixer_neon.cpp (100%) rename {Alc => alc}/mixer/mixer_sse.cpp (100%) rename {Alc => alc}/mixer/mixer_sse2.cpp (100%) rename {Alc => alc}/mixer/mixer_sse3.cpp (100%) rename {Alc => alc}/mixer/mixer_sse41.cpp (100%) rename {Alc => alc}/mixvoice.cpp (100%) rename {Alc => alc}/panning.cpp (100%) rename {Alc => alc}/ringbuffer.cpp (100%) rename {Alc => alc}/ringbuffer.h (100%) rename {Alc => alc}/uhjfilter.cpp (100%) rename {Alc => alc}/uhjfilter.h (100%) rename {Alc => alc}/vector.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bedc4f3..190692c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -638,62 +638,62 @@ SET(OPENAL_OBJS OpenAL32/event.cpp ) SET(ALC_OBJS - Alc/alc.cpp - Alc/alcmain.h - Alc/alu.cpp - Alc/alu.h - Alc/alconfig.cpp - Alc/alconfig.h - Alc/alcontext.h - Alc/ambidefs.h - Alc/bs2b.cpp - Alc/bs2b.h - Alc/converter.cpp - Alc/converter.h - Alc/inprogext.h - Alc/mastering.cpp - Alc/mastering.h - Alc/ringbuffer.cpp - Alc/ringbuffer.h - Alc/effects/base.h - Alc/effects/autowah.cpp - Alc/effects/chorus.cpp - Alc/effects/compressor.cpp - Alc/effects/dedicated.cpp - Alc/effects/distortion.cpp - Alc/effects/echo.cpp - Alc/effects/equalizer.cpp - Alc/effects/fshifter.cpp - Alc/effects/modulator.cpp - Alc/effects/null.cpp - Alc/effects/pshifter.cpp - Alc/effects/reverb.cpp - Alc/effects/vmorpher.cpp - Alc/filters/biquad.h - Alc/filters/biquad.cpp - Alc/filters/nfc.cpp - Alc/filters/nfc.h - Alc/filters/splitter.cpp - Alc/filters/splitter.h - Alc/helpers.cpp - Alc/compat.h - Alc/cpu_caps.h - Alc/fpu_modes.h - Alc/logging.h - Alc/vector.h - Alc/hrtf.cpp - Alc/hrtf.h - Alc/uhjfilter.cpp - Alc/uhjfilter.h - Alc/ambdec.cpp - Alc/ambdec.h - Alc/bformatdec.cpp - Alc/bformatdec.h - Alc/panning.cpp - Alc/mixvoice.cpp - Alc/mixer/defs.h - Alc/mixer/hrtfbase.h - Alc/mixer/mixer_c.cpp + alc/alc.cpp + alc/alcmain.h + alc/alu.cpp + alc/alu.h + alc/alconfig.cpp + alc/alconfig.h + alc/alcontext.h + alc/ambidefs.h + alc/bs2b.cpp + alc/bs2b.h + alc/converter.cpp + alc/converter.h + alc/inprogext.h + alc/mastering.cpp + alc/mastering.h + alc/ringbuffer.cpp + alc/ringbuffer.h + alc/effects/base.h + alc/effects/autowah.cpp + alc/effects/chorus.cpp + alc/effects/compressor.cpp + alc/effects/dedicated.cpp + alc/effects/distortion.cpp + alc/effects/echo.cpp + alc/effects/equalizer.cpp + alc/effects/fshifter.cpp + alc/effects/modulator.cpp + alc/effects/null.cpp + alc/effects/pshifter.cpp + alc/effects/reverb.cpp + alc/effects/vmorpher.cpp + alc/filters/biquad.h + alc/filters/biquad.cpp + alc/filters/nfc.cpp + alc/filters/nfc.h + alc/filters/splitter.cpp + alc/filters/splitter.h + alc/helpers.cpp + alc/compat.h + alc/cpu_caps.h + alc/fpu_modes.h + alc/logging.h + alc/vector.h + alc/hrtf.cpp + alc/hrtf.h + alc/uhjfilter.cpp + alc/uhjfilter.h + alc/ambdec.cpp + alc/ambdec.h + alc/bformatdec.cpp + alc/bformatdec.h + alc/panning.cpp + alc/mixvoice.cpp + alc/mixer/defs.h + alc/mixer/hrtfbase.h + alc/mixer/mixer_c.cpp ) @@ -713,9 +713,9 @@ IF(HAVE_XMMINTRIN_H AND HAVE_EMMINTRIN_H) IF(ALSOFT_CPUEXT_SSE AND ALSOFT_CPUEXT_SSE2) SET(HAVE_SSE 1) SET(HAVE_SSE2 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse.cpp Alc/mixer/mixer_sse2.cpp) + SET(ALC_OBJS ${ALC_OBJS} alc/mixer/mixer_sse.cpp alc/mixer/mixer_sse2.cpp) IF(SSE2_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse.cpp Alc/mixer/mixer_sse2.cpp + SET_SOURCE_FILES_PROPERTIES(alc/mixer/mixer_sse.cpp alc/mixer/mixer_sse2.cpp PROPERTIES COMPILE_FLAGS "${SSE2_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE, SSE2") @@ -733,9 +733,9 @@ IF(HAVE_EMMINTRIN_H) OPTION(ALSOFT_CPUEXT_SSE3 "Enable SSE3 support" ON) IF(HAVE_SSE2 AND ALSOFT_CPUEXT_SSE3) SET(HAVE_SSE3 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse3.cpp) + SET(ALC_OBJS ${ALC_OBJS} alc/mixer/mixer_sse3.cpp) IF(SSE2_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse3.cpp PROPERTIES + SET_SOURCE_FILES_PROPERTIES(alc/mixer/mixer_sse3.cpp PROPERTIES COMPILE_FLAGS "${SSE3_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE3") @@ -750,9 +750,9 @@ IF(HAVE_SMMINTRIN_H) OPTION(ALSOFT_CPUEXT_SSE4_1 "Enable SSE4.1 support" ON) IF(HAVE_SSE3 AND ALSOFT_CPUEXT_SSE4_1) SET(HAVE_SSE4_1 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse41.cpp) + SET(ALC_OBJS ${ALC_OBJS} alc/mixer/mixer_sse41.cpp) IF(SSE4_1_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse41.cpp PROPERTIES + SET_SOURCE_FILES_PROPERTIES(alc/mixer/mixer_sse41.cpp PROPERTIES COMPILE_FLAGS "${SSE4_1_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE4.1") @@ -768,9 +768,9 @@ IF(HAVE_ARM_NEON_H) OPTION(ALSOFT_CPUEXT_NEON "Enable ARM Neon support" ON) IF(ALSOFT_CPUEXT_NEON) SET(HAVE_NEON 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_neon.cpp) + SET(ALC_OBJS ${ALC_OBJS} alc/mixer/mixer_neon.cpp) IF(FPU_NEON_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_neon.cpp PROPERTIES + SET_SOURCE_FILES_PROPERTIES(alc/mixer/mixer_neon.cpp PROPERTIES COMPILE_FLAGS "${FPU_NEON_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, Neon") @@ -809,13 +809,13 @@ ENDIF() SET(BACKENDS "") SET(ALC_OBJS ${ALC_OBJS} - Alc/backends/base.cpp - Alc/backends/base.h + alc/backends/base.cpp + alc/backends/base.h # Default backends, always available - Alc/backends/loopback.cpp - Alc/backends/loopback.h - Alc/backends/null.cpp - Alc/backends/null.h + alc/backends/loopback.cpp + alc/backends/loopback.h + alc/backends/null.cpp + alc/backends/null.h ) # Check ALSA backend @@ -826,7 +826,7 @@ IF(ALSA_FOUND) IF(ALSOFT_BACKEND_ALSA) SET(HAVE_ALSA 1) SET(BACKENDS "${BACKENDS} ALSA${IS_LINKED},") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/alsa.cpp Alc/backends/alsa.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/alsa.cpp alc/backends/alsa.h) ADD_BACKEND_LIBS(${ALSA_LIBRARIES}) SET(INC_PATHS ${INC_PATHS} ${ALSA_INCLUDE_DIRS}) ENDIF() @@ -843,7 +843,7 @@ IF(OSS_FOUND) IF(ALSOFT_BACKEND_OSS) SET(HAVE_OSS 1) SET(BACKENDS "${BACKENDS} OSS,") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/oss.cpp Alc/backends/oss.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/oss.cpp alc/backends/oss.h) IF(OSS_LIBRARIES) SET(EXTRA_LIBS ${OSS_LIBRARIES} ${EXTRA_LIBS}) ENDIF() @@ -862,7 +862,7 @@ IF(AUDIOIO_FOUND) IF(ALSOFT_BACKEND_SOLARIS) SET(HAVE_SOLARIS 1) SET(BACKENDS "${BACKENDS} Solaris,") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/solaris.cpp Alc/backends/solaris.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/solaris.cpp alc/backends/solaris.h) SET(INC_PATHS ${INC_PATHS} ${AUDIOIO_INCLUDE_DIRS}) ENDIF() ENDIF() @@ -878,7 +878,7 @@ IF(SOUNDIO_FOUND) IF(ALSOFT_BACKEND_SNDIO) SET(HAVE_SNDIO 1) SET(BACKENDS "${BACKENDS} SndIO (linked),") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/sndio.cpp Alc/backends/sndio.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/sndio.cpp alc/backends/sndio.h) SET(EXTRA_LIBS ${SOUNDIO_LIBRARIES} ${EXTRA_LIBS}) SET(INC_PATHS ${INC_PATHS} ${SOUNDIO_INCLUDE_DIRS}) ENDIF() @@ -895,7 +895,7 @@ IF(QSA_FOUND) IF(ALSOFT_BACKEND_QSA) SET(HAVE_QSA 1) SET(BACKENDS "${BACKENDS} QSA (linked),") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/qsa.cpp Alc/backends/qsa.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/qsa.cpp alc/backends/qsa.h) SET(EXTRA_LIBS ${QSA_LIBRARIES} ${EXTRA_LIBS}) SET(INC_PATHS ${INC_PATHS} ${QSA_INCLUDE_DIRS}) ENDIF() @@ -930,7 +930,7 @@ IF(WIN32) IF(ALSOFT_BACKEND_WINMM) SET(HAVE_WINMM 1) SET(BACKENDS "${BACKENDS} WinMM,") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/winmm.cpp Alc/backends/winmm.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/winmm.cpp alc/backends/winmm.h) SET(EXTRA_LIBS ${WINMM_LIBRARY} ${EXTRA_LIBS}) ENDIF() ENDIF() @@ -942,7 +942,7 @@ IF(WIN32) IF(ALSOFT_BACKEND_DSOUND) SET(HAVE_DSOUND 1) SET(BACKENDS "${BACKENDS} DirectSound${IS_LINKED},") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/dsound.cpp Alc/backends/dsound.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/dsound.cpp alc/backends/dsound.h) ADD_BACKEND_LIBS(${DSOUND_LIBRARIES}) SET(INC_PATHS ${INC_PATHS} ${DSOUND_INCLUDE_DIRS}) ENDIF() @@ -955,7 +955,7 @@ IF(WIN32) IF(ALSOFT_BACKEND_WASAPI) SET(HAVE_WASAPI 1) SET(BACKENDS "${BACKENDS} WASAPI,") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wasapi.cpp Alc/backends/wasapi.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/wasapi.cpp alc/backends/wasapi.h) ENDIF() ENDIF() @@ -980,7 +980,7 @@ IF(PORTAUDIO_FOUND) IF(ALSOFT_BACKEND_PORTAUDIO) SET(HAVE_PORTAUDIO 1) SET(BACKENDS "${BACKENDS} PortAudio${IS_LINKED},") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/portaudio.cpp Alc/backends/portaudio.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/portaudio.cpp alc/backends/portaudio.h) ADD_BACKEND_LIBS(${PORTAUDIO_LIBRARIES}) SET(INC_PATHS ${INC_PATHS} ${PORTAUDIO_INCLUDE_DIRS}) ENDIF() @@ -997,7 +997,7 @@ IF(PULSEAUDIO_FOUND) IF(ALSOFT_BACKEND_PULSEAUDIO) SET(HAVE_PULSEAUDIO 1) SET(BACKENDS "${BACKENDS} PulseAudio${IS_LINKED},") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/pulseaudio.cpp Alc/backends/pulseaudio.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/pulseaudio.cpp alc/backends/pulseaudio.h) ADD_BACKEND_LIBS(${PULSEAUDIO_LIBRARIES}) SET(INC_PATHS ${INC_PATHS} ${PULSEAUDIO_INCLUDE_DIRS}) ENDIF() @@ -1014,7 +1014,7 @@ IF(JACK_FOUND) IF(ALSOFT_BACKEND_JACK) SET(HAVE_JACK 1) SET(BACKENDS "${BACKENDS} JACK${IS_LINKED},") - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/jack.cpp Alc/backends/jack.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/jack.cpp alc/backends/jack.h) ADD_BACKEND_LIBS(${JACK_LIBRARIES}) SET(INC_PATHS ${INC_PATHS} ${JACK_INCLUDE_DIRS}) ENDIF() @@ -1033,7 +1033,7 @@ IF(COREAUDIO_FRAMEWORK) OPTION(ALSOFT_BACKEND_COREAUDIO "Enable CoreAudio backend" ON) IF(ALSOFT_BACKEND_COREAUDIO) SET(HAVE_COREAUDIO 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/coreaudio.cpp Alc/backends/coreaudio.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/coreaudio.cpp alc/backends/coreaudio.h) SET(BACKENDS "${BACKENDS} CoreAudio,") SET(EXTRA_LIBS ${COREAUDIO_FRAMEWORK} ${EXTRA_LIBS}) SET(EXTRA_LIBS /System/Library/Frameworks/AudioUnit.framework ${EXTRA_LIBS}) @@ -1063,7 +1063,7 @@ IF(OPENSL_FOUND) OPTION(ALSOFT_BACKEND_OPENSL "Enable OpenSL backend" ON) IF(ALSOFT_BACKEND_OPENSL) SET(HAVE_OPENSL 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/opensl.cpp Alc/backends/opensl.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/opensl.cpp alc/backends/opensl.h) SET(BACKENDS "${BACKENDS} OpenSL,") SET(EXTRA_LIBS ${OPENSL_LIBRARIES} ${EXTRA_LIBS}) SET(INC_PATHS ${INC_PATHS} ${OPENSL_INCLUDE_DIRS}) @@ -1081,7 +1081,7 @@ IF(SDL2_FOUND) OPTION(ALSOFT_BACKEND_SDL2 "Enable SDL2 backend" OFF) IF(ALSOFT_BACKEND_SDL2) SET(HAVE_SDL2 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/sdl2.cpp Alc/backends/sdl2.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/sdl2.cpp alc/backends/sdl2.h) SET(BACKENDS "${BACKENDS} SDL2,") SET(EXTRA_LIBS ${SDL2_LIBRARY} ${EXTRA_LIBS}) SET(INC_PATHS ${INC_PATHS} ${SDL2_INCLUDE_DIR}) @@ -1095,7 +1095,7 @@ ENDIF() OPTION(ALSOFT_BACKEND_WAVE "Enable Wave Writer backend" ON) IF(ALSOFT_BACKEND_WAVE) SET(HAVE_WAVE 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wave.cpp Alc/backends/wave.h) + SET(ALC_OBJS ${ALC_OBJS} alc/backends/wave.cpp alc/backends/wave.h) SET(BACKENDS "${BACKENDS} WaveFile,") ENDIF() @@ -1312,7 +1312,7 @@ TARGET_INCLUDE_DIRECTORIES(${IMPL_TARGET} PRIVATE ${INC_PATHS} ${OpenAL_BINARY_DIR} - ${OpenAL_SOURCE_DIR}/Alc + ${OpenAL_SOURCE_DIR}/alc ${OpenAL_SOURCE_DIR}/OpenAL32/Include ${OpenAL_SOURCE_DIR}/common ) diff --git a/Alc/alc.cpp b/alc/alc.cpp similarity index 100% rename from Alc/alc.cpp rename to alc/alc.cpp diff --git a/Alc/alcmain.h b/alc/alcmain.h similarity index 100% rename from Alc/alcmain.h rename to alc/alcmain.h diff --git a/Alc/alconfig.cpp b/alc/alconfig.cpp similarity index 100% rename from Alc/alconfig.cpp rename to alc/alconfig.cpp diff --git a/Alc/alconfig.h b/alc/alconfig.h similarity index 100% rename from Alc/alconfig.h rename to alc/alconfig.h diff --git a/Alc/alcontext.h b/alc/alcontext.h similarity index 100% rename from Alc/alcontext.h rename to alc/alcontext.h diff --git a/Alc/alu.cpp b/alc/alu.cpp similarity index 100% rename from Alc/alu.cpp rename to alc/alu.cpp diff --git a/Alc/alu.h b/alc/alu.h similarity index 100% rename from Alc/alu.h rename to alc/alu.h diff --git a/Alc/ambdec.cpp b/alc/ambdec.cpp similarity index 100% rename from Alc/ambdec.cpp rename to alc/ambdec.cpp diff --git a/Alc/ambdec.h b/alc/ambdec.h similarity index 100% rename from Alc/ambdec.h rename to alc/ambdec.h diff --git a/Alc/ambidefs.h b/alc/ambidefs.h similarity index 100% rename from Alc/ambidefs.h rename to alc/ambidefs.h diff --git a/Alc/backends/alsa.cpp b/alc/backends/alsa.cpp similarity index 100% rename from Alc/backends/alsa.cpp rename to alc/backends/alsa.cpp diff --git a/Alc/backends/alsa.h b/alc/backends/alsa.h similarity index 100% rename from Alc/backends/alsa.h rename to alc/backends/alsa.h diff --git a/Alc/backends/base.cpp b/alc/backends/base.cpp similarity index 100% rename from Alc/backends/base.cpp rename to alc/backends/base.cpp diff --git a/Alc/backends/base.h b/alc/backends/base.h similarity index 100% rename from Alc/backends/base.h rename to alc/backends/base.h diff --git a/Alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp similarity index 100% rename from Alc/backends/coreaudio.cpp rename to alc/backends/coreaudio.cpp diff --git a/Alc/backends/coreaudio.h b/alc/backends/coreaudio.h similarity index 100% rename from Alc/backends/coreaudio.h rename to alc/backends/coreaudio.h diff --git a/Alc/backends/dsound.cpp b/alc/backends/dsound.cpp similarity index 100% rename from Alc/backends/dsound.cpp rename to alc/backends/dsound.cpp diff --git a/Alc/backends/dsound.h b/alc/backends/dsound.h similarity index 100% rename from Alc/backends/dsound.h rename to alc/backends/dsound.h diff --git a/Alc/backends/jack.cpp b/alc/backends/jack.cpp similarity index 100% rename from Alc/backends/jack.cpp rename to alc/backends/jack.cpp diff --git a/Alc/backends/jack.h b/alc/backends/jack.h similarity index 100% rename from Alc/backends/jack.h rename to alc/backends/jack.h diff --git a/Alc/backends/loopback.cpp b/alc/backends/loopback.cpp similarity index 100% rename from Alc/backends/loopback.cpp rename to alc/backends/loopback.cpp diff --git a/Alc/backends/loopback.h b/alc/backends/loopback.h similarity index 100% rename from Alc/backends/loopback.h rename to alc/backends/loopback.h diff --git a/Alc/backends/null.cpp b/alc/backends/null.cpp similarity index 100% rename from Alc/backends/null.cpp rename to alc/backends/null.cpp diff --git a/Alc/backends/null.h b/alc/backends/null.h similarity index 100% rename from Alc/backends/null.h rename to alc/backends/null.h diff --git a/Alc/backends/opensl.cpp b/alc/backends/opensl.cpp similarity index 100% rename from Alc/backends/opensl.cpp rename to alc/backends/opensl.cpp diff --git a/Alc/backends/opensl.h b/alc/backends/opensl.h similarity index 100% rename from Alc/backends/opensl.h rename to alc/backends/opensl.h diff --git a/Alc/backends/oss.cpp b/alc/backends/oss.cpp similarity index 100% rename from Alc/backends/oss.cpp rename to alc/backends/oss.cpp diff --git a/Alc/backends/oss.h b/alc/backends/oss.h similarity index 100% rename from Alc/backends/oss.h rename to alc/backends/oss.h diff --git a/Alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp similarity index 100% rename from Alc/backends/portaudio.cpp rename to alc/backends/portaudio.cpp diff --git a/Alc/backends/portaudio.h b/alc/backends/portaudio.h similarity index 100% rename from Alc/backends/portaudio.h rename to alc/backends/portaudio.h diff --git a/Alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp similarity index 100% rename from Alc/backends/pulseaudio.cpp rename to alc/backends/pulseaudio.cpp diff --git a/Alc/backends/pulseaudio.h b/alc/backends/pulseaudio.h similarity index 100% rename from Alc/backends/pulseaudio.h rename to alc/backends/pulseaudio.h diff --git a/Alc/backends/qsa.cpp b/alc/backends/qsa.cpp similarity index 100% rename from Alc/backends/qsa.cpp rename to alc/backends/qsa.cpp diff --git a/Alc/backends/qsa.h b/alc/backends/qsa.h similarity index 100% rename from Alc/backends/qsa.h rename to alc/backends/qsa.h diff --git a/Alc/backends/sdl2.cpp b/alc/backends/sdl2.cpp similarity index 98% rename from Alc/backends/sdl2.cpp rename to alc/backends/sdl2.cpp index 97547959..29d27c05 100644 --- a/Alc/backends/sdl2.cpp +++ b/alc/backends/sdl2.cpp @@ -22,15 +22,19 @@ #include "backends/sdl2.h" -#include -#include - +#include +#include +#include #include +#include "AL/al.h" + #include "alcmain.h" +#include "almalloc.h" #include "alu.h" -#include "threads.h" -#include "compat.h" +#include "logging.h" + +#include namespace { diff --git a/Alc/backends/sdl2.h b/alc/backends/sdl2.h similarity index 100% rename from Alc/backends/sdl2.h rename to alc/backends/sdl2.h diff --git a/Alc/backends/sndio.cpp b/alc/backends/sndio.cpp similarity index 100% rename from Alc/backends/sndio.cpp rename to alc/backends/sndio.cpp diff --git a/Alc/backends/sndio.h b/alc/backends/sndio.h similarity index 100% rename from Alc/backends/sndio.h rename to alc/backends/sndio.h diff --git a/Alc/backends/solaris.cpp b/alc/backends/solaris.cpp similarity index 100% rename from Alc/backends/solaris.cpp rename to alc/backends/solaris.cpp diff --git a/Alc/backends/solaris.h b/alc/backends/solaris.h similarity index 100% rename from Alc/backends/solaris.h rename to alc/backends/solaris.h diff --git a/Alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp similarity index 100% rename from Alc/backends/wasapi.cpp rename to alc/backends/wasapi.cpp diff --git a/Alc/backends/wasapi.h b/alc/backends/wasapi.h similarity index 100% rename from Alc/backends/wasapi.h rename to alc/backends/wasapi.h diff --git a/Alc/backends/wave.cpp b/alc/backends/wave.cpp similarity index 100% rename from Alc/backends/wave.cpp rename to alc/backends/wave.cpp diff --git a/Alc/backends/wave.h b/alc/backends/wave.h similarity index 100% rename from Alc/backends/wave.h rename to alc/backends/wave.h diff --git a/Alc/backends/winmm.cpp b/alc/backends/winmm.cpp similarity index 100% rename from Alc/backends/winmm.cpp rename to alc/backends/winmm.cpp diff --git a/Alc/backends/winmm.h b/alc/backends/winmm.h similarity index 100% rename from Alc/backends/winmm.h rename to alc/backends/winmm.h diff --git a/Alc/bformatdec.cpp b/alc/bformatdec.cpp similarity index 100% rename from Alc/bformatdec.cpp rename to alc/bformatdec.cpp diff --git a/Alc/bformatdec.h b/alc/bformatdec.h similarity index 100% rename from Alc/bformatdec.h rename to alc/bformatdec.h diff --git a/Alc/bs2b.cpp b/alc/bs2b.cpp similarity index 100% rename from Alc/bs2b.cpp rename to alc/bs2b.cpp diff --git a/Alc/bs2b.h b/alc/bs2b.h similarity index 100% rename from Alc/bs2b.h rename to alc/bs2b.h diff --git a/Alc/compat.h b/alc/compat.h similarity index 100% rename from Alc/compat.h rename to alc/compat.h diff --git a/Alc/converter.cpp b/alc/converter.cpp similarity index 100% rename from Alc/converter.cpp rename to alc/converter.cpp diff --git a/Alc/converter.h b/alc/converter.h similarity index 100% rename from Alc/converter.h rename to alc/converter.h diff --git a/Alc/cpu_caps.h b/alc/cpu_caps.h similarity index 100% rename from Alc/cpu_caps.h rename to alc/cpu_caps.h diff --git a/Alc/effects/autowah.cpp b/alc/effects/autowah.cpp similarity index 100% rename from Alc/effects/autowah.cpp rename to alc/effects/autowah.cpp diff --git a/Alc/effects/base.h b/alc/effects/base.h similarity index 100% rename from Alc/effects/base.h rename to alc/effects/base.h diff --git a/Alc/effects/chorus.cpp b/alc/effects/chorus.cpp similarity index 100% rename from Alc/effects/chorus.cpp rename to alc/effects/chorus.cpp diff --git a/Alc/effects/compressor.cpp b/alc/effects/compressor.cpp similarity index 100% rename from Alc/effects/compressor.cpp rename to alc/effects/compressor.cpp diff --git a/Alc/effects/dedicated.cpp b/alc/effects/dedicated.cpp similarity index 100% rename from Alc/effects/dedicated.cpp rename to alc/effects/dedicated.cpp diff --git a/Alc/effects/distortion.cpp b/alc/effects/distortion.cpp similarity index 100% rename from Alc/effects/distortion.cpp rename to alc/effects/distortion.cpp diff --git a/Alc/effects/echo.cpp b/alc/effects/echo.cpp similarity index 100% rename from Alc/effects/echo.cpp rename to alc/effects/echo.cpp diff --git a/Alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp similarity index 100% rename from Alc/effects/equalizer.cpp rename to alc/effects/equalizer.cpp diff --git a/Alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp similarity index 100% rename from Alc/effects/fshifter.cpp rename to alc/effects/fshifter.cpp diff --git a/Alc/effects/modulator.cpp b/alc/effects/modulator.cpp similarity index 100% rename from Alc/effects/modulator.cpp rename to alc/effects/modulator.cpp diff --git a/Alc/effects/null.cpp b/alc/effects/null.cpp similarity index 100% rename from Alc/effects/null.cpp rename to alc/effects/null.cpp diff --git a/Alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp similarity index 100% rename from Alc/effects/pshifter.cpp rename to alc/effects/pshifter.cpp diff --git a/Alc/effects/reverb.cpp b/alc/effects/reverb.cpp similarity index 100% rename from Alc/effects/reverb.cpp rename to alc/effects/reverb.cpp diff --git a/Alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp similarity index 100% rename from Alc/effects/vmorpher.cpp rename to alc/effects/vmorpher.cpp diff --git a/Alc/filters/biquad.cpp b/alc/filters/biquad.cpp similarity index 100% rename from Alc/filters/biquad.cpp rename to alc/filters/biquad.cpp diff --git a/Alc/filters/biquad.h b/alc/filters/biquad.h similarity index 100% rename from Alc/filters/biquad.h rename to alc/filters/biquad.h diff --git a/Alc/filters/nfc.cpp b/alc/filters/nfc.cpp similarity index 100% rename from Alc/filters/nfc.cpp rename to alc/filters/nfc.cpp diff --git a/Alc/filters/nfc.h b/alc/filters/nfc.h similarity index 100% rename from Alc/filters/nfc.h rename to alc/filters/nfc.h diff --git a/Alc/filters/splitter.cpp b/alc/filters/splitter.cpp similarity index 100% rename from Alc/filters/splitter.cpp rename to alc/filters/splitter.cpp diff --git a/Alc/filters/splitter.h b/alc/filters/splitter.h similarity index 100% rename from Alc/filters/splitter.h rename to alc/filters/splitter.h diff --git a/Alc/fpu_modes.h b/alc/fpu_modes.h similarity index 100% rename from Alc/fpu_modes.h rename to alc/fpu_modes.h diff --git a/Alc/helpers.cpp b/alc/helpers.cpp similarity index 100% rename from Alc/helpers.cpp rename to alc/helpers.cpp diff --git a/Alc/hrtf.cpp b/alc/hrtf.cpp similarity index 100% rename from Alc/hrtf.cpp rename to alc/hrtf.cpp diff --git a/Alc/hrtf.h b/alc/hrtf.h similarity index 100% rename from Alc/hrtf.h rename to alc/hrtf.h diff --git a/Alc/inprogext.h b/alc/inprogext.h similarity index 100% rename from Alc/inprogext.h rename to alc/inprogext.h diff --git a/Alc/logging.h b/alc/logging.h similarity index 100% rename from Alc/logging.h rename to alc/logging.h diff --git a/Alc/mastering.cpp b/alc/mastering.cpp similarity index 100% rename from Alc/mastering.cpp rename to alc/mastering.cpp diff --git a/Alc/mastering.h b/alc/mastering.h similarity index 100% rename from Alc/mastering.h rename to alc/mastering.h diff --git a/Alc/mixer/defs.h b/alc/mixer/defs.h similarity index 100% rename from Alc/mixer/defs.h rename to alc/mixer/defs.h diff --git a/Alc/mixer/hrtfbase.h b/alc/mixer/hrtfbase.h similarity index 100% rename from Alc/mixer/hrtfbase.h rename to alc/mixer/hrtfbase.h diff --git a/Alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp similarity index 100% rename from Alc/mixer/mixer_c.cpp rename to alc/mixer/mixer_c.cpp diff --git a/Alc/mixer/mixer_neon.cpp b/alc/mixer/mixer_neon.cpp similarity index 100% rename from Alc/mixer/mixer_neon.cpp rename to alc/mixer/mixer_neon.cpp diff --git a/Alc/mixer/mixer_sse.cpp b/alc/mixer/mixer_sse.cpp similarity index 100% rename from Alc/mixer/mixer_sse.cpp rename to alc/mixer/mixer_sse.cpp diff --git a/Alc/mixer/mixer_sse2.cpp b/alc/mixer/mixer_sse2.cpp similarity index 100% rename from Alc/mixer/mixer_sse2.cpp rename to alc/mixer/mixer_sse2.cpp diff --git a/Alc/mixer/mixer_sse3.cpp b/alc/mixer/mixer_sse3.cpp similarity index 100% rename from Alc/mixer/mixer_sse3.cpp rename to alc/mixer/mixer_sse3.cpp diff --git a/Alc/mixer/mixer_sse41.cpp b/alc/mixer/mixer_sse41.cpp similarity index 100% rename from Alc/mixer/mixer_sse41.cpp rename to alc/mixer/mixer_sse41.cpp diff --git a/Alc/mixvoice.cpp b/alc/mixvoice.cpp similarity index 100% rename from Alc/mixvoice.cpp rename to alc/mixvoice.cpp diff --git a/Alc/panning.cpp b/alc/panning.cpp similarity index 100% rename from Alc/panning.cpp rename to alc/panning.cpp diff --git a/Alc/ringbuffer.cpp b/alc/ringbuffer.cpp similarity index 100% rename from Alc/ringbuffer.cpp rename to alc/ringbuffer.cpp diff --git a/Alc/ringbuffer.h b/alc/ringbuffer.h similarity index 100% rename from Alc/ringbuffer.h rename to alc/ringbuffer.h diff --git a/Alc/uhjfilter.cpp b/alc/uhjfilter.cpp similarity index 100% rename from Alc/uhjfilter.cpp rename to alc/uhjfilter.cpp diff --git a/Alc/uhjfilter.h b/alc/uhjfilter.h similarity index 100% rename from Alc/uhjfilter.h rename to alc/uhjfilter.h diff --git a/Alc/vector.h b/alc/vector.h similarity index 100% rename from Alc/vector.h rename to alc/vector.h