diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-08-03 13:36:16 +1000 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-08-03 13:36:16 +1000 |
| commit | bef86811c9a08711b45523193b2ac7c13850f8c6 (patch) | |
| tree | 9f9218b4b4443034069ad3f37e5d5e42da057cdb | |
| parent | 4f511c2aaae9d2d32e53b4590e841c00fab6164b (diff) | |
revert libsamplerate addition
sadge
| -rw-r--r-- | .github/workflows/build_linux.yml | 2 | ||||
| -rw-r--r-- | source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/application/StarMainApplication_sdl.cpp | 3 | ||||
| -rw-r--r-- | source/vcpkg.json | 6 |
4 files changed, 2 insertions, 11 deletions
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 252b467..307b30f 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -20,7 +20,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y pkg-config libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsamplerate0-dev libsdl2-dev + sudo apt-get install -y pkg-config libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsdl2-dev - name: Install CMake & Ninja uses: lukka/get-cmake@latest diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index cdd32f1..d13d59d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -486,11 +486,9 @@ set(STAR_EXT_LIBS ${STAR_EXT_LIBS} ) if(STAR_BUILD_GUI) - find_package(SampleRate CONFIG REQUIRED) find_package(SDL2 CONFIG REQUIRED) set(STAR_EXT_GUI_LIBS - SampleRate::samplerate $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main> $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static> ) diff --git a/source/application/StarMainApplication_sdl.cpp b/source/application/StarMainApplication_sdl.cpp index 49d085a..c697a26 100644 --- a/source/application/StarMainApplication_sdl.cpp +++ b/source/application/StarMainApplication_sdl.cpp @@ -271,9 +271,6 @@ public: #endif Logger::info("Application: Initializing SDL Audio"); -#if SDL_VERSION_ATLEAST(2, 0, 26) - SDL_SetHint(SDL_HINT_AUDIO_RESAMPLING_MODE, "fast"); -#endif if (SDL_InitSubSystem(SDL_INIT_AUDIO)) throw ApplicationException(strf("Couldn't initialize SDL Audio: {}", SDL_GetError())); diff --git a/source/vcpkg.json b/source/vcpkg.json index d397f03..f603aab 100644 --- a/source/vcpkg.json +++ b/source/vcpkg.json @@ -2,11 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "dependencies": [ "glew", - "libsamplerate", - { - "name": "sdl2", - "features": [ "samplerate" ] - }, + "sdl2", "libvorbis", "zlib", "freetype", |