From e6cbd31e72b059dd79e4eae8420d0994fdaf17d3 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 17:09:48 +0100 Subject: [PATCH] Revert "Fix Haiku build" This reverts commit e716de35cc75e25983e10bdd3d768f659fdb2971. --- cmake/Modules/FindFluidSynth.cmake | 41 ------------------------------ src/sdl/sdl_sound.c | 4 --- 2 files changed, 45 deletions(-) delete mode 100644 cmake/Modules/FindFluidSynth.cmake diff --git a/cmake/Modules/FindFluidSynth.cmake b/cmake/Modules/FindFluidSynth.cmake deleted file mode 100644 index 37bd7392e..000000000 --- a/cmake/Modules/FindFluidSynth.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Find FluidSynth -# Once done, this will define -# -# FLUIDSYNTH_FOUND - system has FluidSynth -# FLUIDSYNTH_INCLUDE_DIRS - FluidSynth include directories -# FLUIDSYNTH_LIBRARIES - link libraries - -include(LibFindMacros) - -libfind_pkg_check_modules(FLUIDSYNTH_PKGCONF FLUIDSYNTH) - -# includes -find_path(FLUIDSYNTH_INCLUDE_DIR - NAMES fluidsynth.h - PATHS - ${FLUIDSYNTH_PKGCONF_INCLUDE_DIRS} -) - -# library -find_library(FLUIDSYNTH_LIBRARY - NAMES fluidsynth - PATHS - ${FLUIDSYNTH_PKGCONF_LIBRARY_DIRS} - "/usr/lib" - "/usr/local/lib" -) - -# set include dir variables -set(FLUIDSYNTH_PROCESS_INCLUDES FLUIDSYNTH_INCLUDE_DIR) -set(FLUIDSYNTH_PROCESS_LIBS FLUIDSYNTH_LIBRARY) -libfind_process(FLUIDSYNTH) - -if(FLUIDSYNTH_FOUND AND NOT TARGET FluidSynth::libfluidsynth) - add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED) - set_target_properties( - FluidSynth::libfluidsynth - PROPERTIES - IMPORTED_LOCATION "${FLUIDSYNTH_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${FLUIDSYNTH_INCLUDE_DIR}" - ) -endif() diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index 259d4ac93..a73c8ff6e 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -1197,11 +1197,7 @@ boolean I_SetSongSpeed(float speed) if (synth_player) { SDL_LockAudioStream(audio_stream); -#if FLUIDSYNTH_VERSION_MINOR < 2 - fluid_player_set_bpm(synth_player, speed); -#else fluid_player_set_tempo(synth_player, FLUID_PLAYER_TEMPO_INTERNAL, speed); -#endif SDL_UnlockAudioStream(audio_stream); return true; }