Skip to content

Update LabSound to the latest HEAD #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdw-software merged 2 commits into from
May 6, 2025
Merged

Update LabSound to the latest HEAD #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de2f4b6
Deps: Update LabSound to the latest HEAD
rdw-software May 6, 2025
690c45f
Deps: Fix LabSound build errors via diff patch
rdw-software May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/LabSound/LabSound
Open in desktop
Submodule LabSound updated 87 files
+34 −5 cmake/LabSound.cmake
+383 −0 docs/python-tdd.md
+432 −0 docs/webaudio-labsound-comparison.md
+1 −1 examples/src/ExamplesMain.cpp
+1 −1 include/LabSound/backends/AudioDevice_Miniaudio.h
+60 −0 include/LabSound/backends/AudioDevice_MockAudio.h
+179 −0 include/LabSound/core/AudioContext.h
+5 −0 include/LabSound/core/AudioDevice.h
+74 −0 labsoundpy/.gitignore
+55 −0 labsoundpy/CMakeLists.txt
+98 −0 labsoundpy/CONTRIBUTING.md
+186 −0 labsoundpy/README.md
+77 −0 labsoundpy/docs/README.md
+59 −0 labsoundpy/examples/README.md
+130 −0 labsoundpy/examples/custom_processing.py
+104 −0 labsoundpy/examples/distortion_effect.py
+85 −0 labsoundpy/examples/numpy_processing.py
+55 −0 labsoundpy/examples/simple_oscillator.py
+70 −0 labsoundpy/examples/spatial_audio.py
+53 −0 labsoundpy/labsound/__init__.py
+3 −0 labsoundpy/labsound/_version.py
+271 −0 labsoundpy/labsound/audio_context.py
+78 −0 labsoundpy/labsound/audio_node.py
+116 −0 labsoundpy/labsound/audio_param.py
+40 −0 labsoundpy/labsound/nodes/__init__.py
+157 −0 labsoundpy/labsound/nodes/analyzer_node.py
+183 −0 labsoundpy/labsound/nodes/buffer_source_node.py
+44 −0 labsoundpy/labsound/nodes/channel_merger_node.py
+36 −0 labsoundpy/labsound/nodes/channel_splitter_node.py
+59 −0 labsoundpy/labsound/nodes/constant_source_node.py
+83 −0 labsoundpy/labsound/nodes/convolver_node.py
+41 −0 labsoundpy/labsound/nodes/delay_node.py
+45 −0 labsoundpy/labsound/nodes/destination_node.py
+126 −0 labsoundpy/labsound/nodes/dynamics_compressor_node.py
+62 −0 labsoundpy/labsound/nodes/function_node.py
+288 −0 labsoundpy/labsound/nodes/panner_node.py
+44 −0 labsoundpy/labsound/nodes/stereo_panner_node.py
+70 −0 labsoundpy/labsound/nodes/wave_shaper_node.py
+78 −0 labsoundpy/setup.py
+78 −0 labsoundpy/src/audio_context.cpp
+15 −0 labsoundpy/src/audio_context.h
+30 −0 labsoundpy/src/audio_node.cpp
+15 −0 labsoundpy/src/audio_node.h
+28 −0 labsoundpy/src/audio_param.cpp
+15 −0 labsoundpy/src/audio_param.h
+69 −0 labsoundpy/src/core.cpp
+63 −0 labsoundpy/src/nodes/analyzer_node.cpp
+15 −0 labsoundpy/src/nodes/analyzer_node.h
+80 −0 labsoundpy/src/nodes/biquad_filter_node.cpp
+15 −0 labsoundpy/src/nodes/biquad_filter_node.h
+42 −0 labsoundpy/src/nodes/buffer_source_node.cpp
+15 −0 labsoundpy/src/nodes/buffer_source_node.h
+15 −0 labsoundpy/src/nodes/channel_merger_node.cpp
+15 −0 labsoundpy/src/nodes/channel_merger_node.h
+14 −0 labsoundpy/src/nodes/channel_splitter_node.cpp
+15 −0 labsoundpy/src/nodes/channel_splitter_node.h
+16 −0 labsoundpy/src/nodes/constant_source_node.cpp
+15 −0 labsoundpy/src/nodes/constant_source_node.h
+21 −0 labsoundpy/src/nodes/convolver_node.cpp
+15 −0 labsoundpy/src/nodes/convolver_node.h
+16 −0 labsoundpy/src/nodes/delay_node.cpp
+15 −0 labsoundpy/src/nodes/delay_node.h
+15 −0 labsoundpy/src/nodes/destination_node.cpp
+15 −0 labsoundpy/src/nodes/destination_node.h
+31 −0 labsoundpy/src/nodes/dynamics_compressor_node.cpp
+15 −0 labsoundpy/src/nodes/dynamics_compressor_node.h
+31 −0 labsoundpy/src/nodes/function_node.cpp
+15 −0 labsoundpy/src/nodes/function_node.h
+16 −0 labsoundpy/src/nodes/gain_node.cpp
+15 −0 labsoundpy/src/nodes/gain_node.h
+67 −0 labsoundpy/src/nodes/oscillator_node.cpp
+15 −0 labsoundpy/src/nodes/oscillator_node.h
+114 −0 labsoundpy/src/nodes/panner_node.cpp
+15 −0 labsoundpy/src/nodes/panner_node.h
+16 −0 labsoundpy/src/nodes/stereo_panner_node.cpp
+15 −0 labsoundpy/src/nodes/stereo_panner_node.h
+61 −0 labsoundpy/src/nodes/wave_shaper_node.cpp
+15 −0 labsoundpy/src/nodes/wave_shaper_node.h
+63 −0 labsoundpy/tests/README.md
+128 −0 labsoundpy/tests/test_basic.py
+153 −0 labsoundpy/todo-pypi.md
+2 −1 src/backends/miniaudio/AudioDevice_Miniaudio.cpp
+243 −0 src/backends/mockAudio/AudioDevice_MockAudio.cpp
+18 −2 src/core/AudioContext.cpp
+8 −1 src/core/AudioNode.cpp
+12 −10 src/core/AudioNodeInput.cpp
+15 −12 src/extended/PowerMonitorNode.cpp
16 changes: 16 additions & 0 deletions deps/LabSound/cmakebuild-fixup.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/cmake/LabSound.cmake b/cmake/LabSound.cmake
index 82b3326e..583b1640 100644
--- a/cmake/LabSound.cmake
+++ b/cmake/LabSound.cmake
@@ -44,9 +44,9 @@ elseif (LABSOUND_USE_RTAUDIO)
)
endif()

-option(LABSOUND_INTERNAL_LIBSAMPLERATE, "Use internal libsamplerate", ON)
+option(LABSOUND_INTERNAL_LIBSAMPLERATE "Use internal libsamplerate" ON)
if (LABSOUND_INTERNAL_LIBSAMPLERATE)
- set(LABSOUND_LSR "${LABSOUND_ROOT}/src/internal/src/samplerate.c")
+ set(LABSOUND_LSR "${LABSOUND_ROOT}/src/internal/src/libSampleRate.c")
else()
find_package(libsamplerate)
if (NOT libsamplerate_FOUND)
14 changes: 14 additions & 0 deletions deps/labsound-unixbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ OUT_DIR=$(pwd)/ninjabuild-unix
SRC_DIR=$(pwd)/deps/LabSound/LabSound
BUILD_DIR=$SRC_DIR/cmakebuild-unix

cleanup() {
echo "Reverting CMakeLists patch (to make sure the build is idempotent)"
cd $SRC_DIR
git apply -R ../cmakebuild-fixup.diff
cd -
}

trap cleanup EXIT

echo "Applying CMakeLists patch (this should hopefully be temporary)"
cd $SRC_DIR
git apply ../cmakebuild-fixup.diff
cd -

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-fpermissive -DCMAKE_CXX_COMPILER=g++ -DLABSOUND_USE_MINIAUDIO=OFF -DLABSOUND_USE_RTAUDIO=ON
cmake --build $BUILD_DIR --clean-first --config Release

Expand Down
14 changes: 14 additions & 0 deletions deps/labsound-windowsbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ OUT_DIR=$(pwd)/ninjabuild-windows
SRC_DIR=$(pwd)/deps/LabSound/LabSound
BUILD_DIR=$SRC_DIR/cmakebuild-windows

cleanup() {
echo "Reverting CMakeLists patch (to make sure the build is idempotent)"
cd $SRC_DIR
git apply -R ../cmakebuild-fixup.diff
cd -
}

trap cleanup EXIT

echo "Applying CMakeLists patch (this should hopefully be temporary)"
cd $SRC_DIR
git apply ../cmakebuild-fixup.diff
cd -

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-fpermissive -DCMAKE_CXX_COMPILER=g++ -DLABSOUND_USE_MINIAUDIO=OFF -DLABSOUND_USE_RTAUDIO=ON
cmake --build $BUILD_DIR --clean-first --config Release

Expand Down
Loading