Skip to content

Commit

Permalink
fix: Removal of bundled r8brain resampler.
Browse files Browse the repository at this point in the history
  • Loading branch information
na2axl committed Dec 5, 2024
1 parent 239c7d3 commit 187af7d
Show file tree
Hide file tree
Showing 23 changed files with 57 additions and 9,453 deletions.
14 changes: 0 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ set(SA_SOURCE
src/DSP/Filters/WaveShaperFilter.h
src/DSP/Resamplers/DefaultResampler.cpp
src/DSP/Resamplers/DefaultResampler.h
src/DSP/Resamplers/R8BrainResampler.h
src/DSP/AudioConverter.cpp
src/DSP/Convolver.cpp
src/DSP/Delay.cpp
Expand Down Expand Up @@ -420,19 +419,6 @@ set(SA_SOURCE
src/Utils/Audio/Compression/ADPCM/ADPCM.h
src/Utils/Audio/FFT/AudioFFT.cpp
src/Utils/Audio/FFT/AudioFFT.h
src/Utils/Audio/Resampling/CDSPBlockConvolver.h
src/Utils/Audio/Resampling/CDSPFIRFilter.h
src/Utils/Audio/Resampling/CDSPFracInterpolator.h
src/Utils/Audio/Resampling/CDSPHBDownsampler.h
src/Utils/Audio/Resampling/CDSPHBUpsampler.h
src/Utils/Audio/Resampling/CDSPProcessor.h
src/Utils/Audio/Resampling/CDSPRealFFT.h
src/Utils/Audio/Resampling/CDSPResampler.h
src/Utils/Audio/Resampling/CDSPSincFilterGen.h
src/Utils/Audio/Resampling/r8bbase.cpp
src/Utils/Audio/Resampling/r8bbase.h
src/Utils/Audio/Resampling/r8bconf.h
src/Utils/Audio/Resampling/r8butil.h
src/Utils/Freeverb/AllPass.cpp
src/Utils/Freeverb/AllPass.h
src/Utils/Freeverb/Comb.cpp
Expand Down
7 changes: 0 additions & 7 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ which was licensed under the BSD-3-Clause License.
This software contains code derived from AudioFFT and FFTConvolution (https://github.com/HiFi-LoFi/AudioFFT),
Copyright (c) 2017 HiFi-LoFi, which was licensed under the MIT License.

This software includes code of the r8brain-free-src library (https://github.com/avaneev/r8brain-free-src),
Copyright (c) 2013-2022 Aleksey Vaneev, and distributed under the MIT License.

This software includes implementations derived from the ambisonic-lib library (https://github.com/delikas/ambisonic-lib),
Copyright (c) 2014 greekgoddj, and distributed under the MIT License.

Expand All @@ -41,7 +38,3 @@ Copyright 2018 Google Inc, and distributed under the Apache-2.0 License.

The Amplimix code is heavily inspired by the atomix library (https://github.com/BareRose/atomix) licensed under
the CC0-1.0 License.

The FLAC Codec plugin contains software developed by Xiph.org and licensed under the BSD-3-Clause License.

The Vorbis Codec plugin contains software developed by Xiph.org and licensed under the BSD-3-Clause License.
2 changes: 1 addition & 1 deletion sample_project/soundbanks/init.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":1,"name":"init","switch_containers":["footsteps.amswitchcontainer"],"collections":["grass_footsteps.amcollection","metal_footsteps.amcollection","snow_footsteps.amcollection","throw_collection_1.amcollection","throw_collection_2.amcollection"],"sounds":["background/AMBForst_Forest_ID_0100_BSB.wav.amsound","footsteps/grass/a.mp3.amsound","footsteps/grass/b.mp3.amsound","footsteps/grass/c.mp3.amsound","footsteps/grass/d.mp3.amsound","footsteps/grass/e.mp3.amsound","footsteps/grass/f.mp3.amsound","footsteps/grass/g.mp3.amsound","footsteps/metal/a.mp3.amsound","footsteps/metal/b.mp3.amsound","footsteps/snow/a.mp3.amsound","footsteps/snow/b.mp3.amsound","music/symphony.ogg.amsound","throw_01.ogg.amsound","throw_02.ogg.amsound","throw_03.ogg.amsound","throw_04.ogg.amsound","throw_05.ogg.amsound","throw_06.ogg.amsound","throw_07.ogg.amsound","throw_08.ogg.amsound"],"events":["mute_bg_bus.amevent","play_throw.amevent","player_footstep.amevent","stop_throw.amevent"],"attenuators":["impact.amattenuation","pipe.amattenuation","room.amattenuation"],"switches":["env.amswitch","surface_type.amswitch"],"rtpc":["rtpc_player_height.amrtpc","wind_force.amrtpc"],"effects":["bassboost.amfx","delay.amfx","flanger.amfx","lpf.amfx","robotize.amfx"]}
{"id":1,"name":"init","switch_containers":["footsteps.amswitchcontainer"],"collections":["grass_footsteps.amcollection","metal_footsteps.amcollection","snow_footsteps.amcollection","test_collection.amcollection","throw_collection_1.amcollection","throw_collection_2.amcollection"],"sounds":["background/AMBForst_Forest_ID_0100_BSB.wav.amsound","footsteps/grass/a.mp3.amsound","footsteps/grass/b.mp3.amsound","footsteps/grass/c.mp3.amsound","footsteps/grass/d.mp3.amsound","footsteps/grass/e.mp3.amsound","footsteps/grass/f.mp3.amsound","footsteps/grass/g.mp3.amsound","footsteps/metal/a.mp3.amsound","footsteps/metal/b.mp3.amsound","footsteps/snow/a.mp3.amsound","footsteps/snow/b.mp3.amsound","music/symphony.ogg.amsound","tests/test_sound_01.amsound","tests/test_sound_02.amsound","tests/test_sound_03.amsound","throw_01.ogg.amsound","throw_02.ogg.amsound","throw_03.ogg.amsound","throw_04.ogg.amsound","throw_05.ogg.amsound","throw_06.ogg.amsound","throw_07.ogg.amsound","throw_08.ogg.amsound"],"events":["mute_bg_bus.amevent","play_throw.amevent","player_footstep.amevent","stop_throw.amevent"],"attenuators":["impact.amattenuation","pipe.amattenuation","room.amattenuation"],"switches":["env.amswitch","surface_type.amswitch"],"rtpc":["rtpc_player_height.amrtpc","wind_force.amrtpc"],"effects":["bassboost.amfx","delay.amfx","equalizer.amfx","flanger.amfx","lpf.amfx","robotize.amfx"]}
1 change: 0 additions & 1 deletion src/Core/DefaultPlugins.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#pragma region Default Resamplers

#include <DSP/Resamplers/DefaultResampler.h>
#include <DSP/Resamplers/R8BrainResampler.h>

#pragma endregion

Expand Down
Loading

0 comments on commit 187af7d

Please sign in to comment.