Merge pull request #280 from mrikola/music

Add fluidsynth-lite to Windows builds

Author: Interrupt

Diff for: CMakeLists.txt

@@ -55,7 +55,7 @@ message(STATUS "Found SDL2 Include:${SDL2_INCLUDE_DIRS} Library:${SDL2_LIBRARIES
 message(STATUS "Found SDL2_Mixer Include:${SDL2_MIXER_INCLUDE_DIRS} Library:${SDL2_MIXER_LIBRARIES}")
 
 # Find FluidSynth
-find_library(FLUIDSYNTH_LIBRARY fluidsynth)
+find_library(FLUIDSYNTH_LIBRARY fluidsynth PATHS build_ext/fluidsynth-lite/src)
 
 # for now I'll put a Carbon/Carbon.h into src/stubs/
 # that defines Mac-specific types and provides stubs for used functions
@@ -331,8 +331,10 @@ target_link_libraries(systemshock
 )
 
 if(FLUIDSYNTH_LIBRARY)
+  message(STATUS "Fluidsynth found")
   add_definitions("-DUSE_FLUIDSYNTH=1")
   target_link_libraries(systemshock "${FLUIDSYNTH_LIBRARY}")
+  include_directories(${CMAKE_SOURCE_DIR}/build_ext/fluidsynth-lite/include)
 endif()
 
 if (WIN32)

Diff for: appveyor.yml

@@ -13,7 +13,8 @@ environment:
 # Avoid rebuilding external dependencies (ie. SDL and SDL_mixer)
 # Uncache build_ext if external deps change
 cache:
-#  - build_ext  
+  - res/music.sf2
+  - build_ext  
 
 # Actual build script..
 # Step 1: Git has to reside in a path without spaces because the SDL build script is weird like that.
@@ -23,7 +24,7 @@ cache:
 build_script:
   - mklink /D c:\git "C:\Program Files\Git"
   - set PATH=%PATH:C:\Program Files (x86)\Git\bin;=%
-  - set PATH=c:\git\usr\bin;%PATH%;C:\MinGW\bin
+  - set PATH=c:\git\usr\bin;%PATH%;C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin\
   - copy windows\make.exe \git\usr\bin
   - set CMAKE_MAKE_PROGRAM=c:\git\usr\bin\make.exe
   - sh build_windows.sh
@@ -39,8 +40,9 @@ after_build:
   - copy build_ext\built_sdl\bin\SDL*.dll .
   - copy build_ext\built_sdl_mixer\bin\SDL*.dll .
   - copy build_ext\built_glew\lib\glew32.dll .
+  - copy build_ext\fluidsynth-lite\src\libfluidsynth.dll .
   - copy readme\readme-windows.txt readme.txt
-  - 7z a systemshock-windows.zip systemshock.exe *.dll readme.txt shaders/
+  - 7z a systemshock-windows.zip systemshock.exe *.dll readme.txt shaders/ res/
 
 artifacts:
   - path: systemshock-windows.zip

Diff for: build_deps.sh

@@ -10,6 +10,10 @@ if [ -d ./build_ext/ ]; then
 	exit
 fi
 
+if [ ! -d ./res/ ]; then
+	mkdir ./res/
+fi
+
 mkdir ./build_ext/
 cd ./build_ext/
 
@@ -32,13 +36,33 @@ function build_sdl_mixer {
 	tar xvf SDL2_mixer-${SDL2_mixer_version}.tar.gz
 	pushd SDL2_mixer-${SDL2_mixer_version}
 
-  export SDL2_CONFIG="${install_dir}/built_sdl/bin/sdl2-config"
+	export SDL2_CONFIG="${install_dir}/built_sdl/bin/sdl2-config"
 	./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32" --prefix=${install_dir}/built_sdl_mixer
 	make
 	make install
 
 	popd
 }
 
+function build_fluidsynth {
+	git clone https://github.com/Doom64/fluidsynth-lite.git
+	pushd fluidsynth-lite
+	sed -i 's/DLL"\ off/DLL"\ on/' CMakeLists.txt
+	# if building fluidsynth fails, move on without it
+	set +e
+	cmake .
+	cmake --build .
+
+	# download a soundfont that's close to the Windows default everyone knows
+	curl -o music.sf2 http://rancid.kapsi.fi/windows.sf2
+	set -e
+	popd
+}
+
+
 build_sdl
 build_sdl_mixer
+build_fluidsynth
+
+cd ..
+mv build_ext/fluidsynth-lite/*.sf2 ./res

Diff for: build_windows.sh

@@ -7,6 +7,7 @@ GLEW_version=2.1.0
 CMAKE_version=3.11.3
 #CMAKE_architecture=win64-x64
 CMAKE_architecture=win32-x86
+CMAKE_target=Unix\ Makefiles
 
 # Removing the mwindows linker option lets us get console output
 function remove_mwindows {
@@ -52,6 +53,21 @@ function build_glew {
 	popd
 }
 
+function build_fluidsynth {
+	git clone https://github.com/Doom64/fluidsynth-lite.git
+	pushd fluidsynth-lite
+	sed -i 's/DLL"\ off/DLL"\ on/' CMakeLists.txt
+	# if building fluidsynth fails, move on without it
+	set +e
+	cmake -G "${CMAKE_target}" .
+	cmake --build .
+
+	# download a soundfont that's close to the Windows default everyone knows
+	curl -o music.sf2 http://rancid.kapsi.fi/windows.sf2
+	set -e
+	popd
+}
+
 function get_cmake {
 	curl -O https://cmake.org/files/v3.11/cmake-${CMAKE_version}-${CMAKE_architecture}.zip
 	unzip cmake-${CMAKE_version}-${CMAKE_architecture}.zip
@@ -72,35 +88,47 @@ rm -rf CMakeFiles/
 rm -rf CMakeCache.txt
 
 cp windows/make.exe /usr/bin/
+
+if [ ! -d ./res/ ]; then
+mkdir ./res/
+fi
+
 mkdir ./build_ext/
 cd ./build_ext/
 install_dir=`pwd -W`
 
-build_sdl
-build_sdl_mixer
-build_glew
-
 if ! [ -x "$(command -v cmake)" ]; then
 	echo "Getting CMake"
 	get_cmake
 fi
 
-# Back to the root directory, copy SDL DLL files for the executable
+build_fluidsynth
+
+build_sdl
+build_sdl_mixer
+build_glew
+
+
+# Back to the root directory, copy required DLL files for the executable
 cd ..
 cp build_ext/built_sdl/bin/SDL*.dll .
 cp build_ext/built_sdl_mixer/bin/SDL*.dll .
 cp build_ext/built_glew/lib/*.dll .
+cp build_ext/fluidsynth-lite/src/*.dll .
+
+# move the soundfont to the correct place if we successfully built fluidsynth
+mv build_ext/fluidsynth-lite/*.sf2 ./res
 
 # Set up build.bat
 if [[ -z "${APPVEYOR}" ]]; then
 	echo "Normal build"
 	echo "@echo off
 	set PATH=%PATH%;${CMAKE_ROOT}
-	cmake -G \"MinGW Makefiles\" .
+	cmake -G \"${CMAKE_target}\" .
 	mingw32-make systemshock" >build.bat
 else
 	echo "Appveyor"
-	echo "cmake -G \"Unix Makefiles\" . 
+	echo "cmake -G \"${CMAKE_target}\" . 
 	make systemshock" >build.bat
 fi
 

Diff for: src/GameSrc/cutsloop.c

@@ -69,6 +69,7 @@ extern char EngSubtitle[256];
 extern char FrnSubtitle[256];
 extern char GerSubtitle[256];
 
+extern SDL_AudioDeviceID device;
 
 
 extern void change_svga_screen_mode(void);
@@ -140,7 +141,7 @@ void cutscene_exit(void)
 
   if (cutscene_audiostream != NULL)
   {
-    SDL_PauseAudio(1);
+    SDL_PauseAudioDevice(device, 1);
     SDL_Delay(1);
 
     SDL_FreeAudioStream(cutscene_audiostream);
@@ -171,7 +172,7 @@ void cutscene_loop(void)
 
   if (cutscene_audiostream)
   {
-    SDL_PauseAudio(0);
+    SDL_PauseAudioDevice(device, 0);
 
     if (cutscene_audiobuffer_size > 0)
     {
@@ -307,7 +308,7 @@ short play_cutscene(int id, bool show_credits)
 
   if (sfx_on)
   {
-    SDL_PauseAudio(1);
+    SDL_PauseAudioDevice(device, 1);
     SDL_Delay(1);
 
     cutscene_audiostream = SDL_NewAudioStream(AUDIO_U8, 1, fix_int(amovie->a.sampleRate), AUDIO_S16SYS, 2, 48000);

Diff for: src/MacSrc/SDLSound.c

@@ -32,8 +32,17 @@ int snd_start_digital(void) {
     spec.callback = AudioStreamCallback;
     spec.userdata = (void *)&cutscene_audiostream;
 
-    if (SDL_OpenAudio(&spec, &obtained)) {ERROR("Could not open SDL audio");}
-    else {INFO("Opened Music Stream");}
+    extern SDL_AudioDeviceID device;
+    device = SDL_OpenAudioDevice(NULL, 0, &spec, &obtained, 0);
+
+    if (device == 0) {
+        ERROR("Could not open SDL audio");
+    } else {
+        INFO("Opened Music Stream, deviceID %d, freq %d, size %d, format %d, channels %d, samples %d", device,
+             obtained.freq, obtained.size, obtained.format, obtained.channels, obtained.samples);
+    }
+
+    SDL_PauseAudioDevice(device, 0);
 
 
     if (Mix_Init(MIX_INIT_MP3) < 0) {ERROR("%s: Init failed", __FUNCTION__);}

Diff for: src/MacSrc/Shock.c

@@ -97,6 +97,8 @@ SDL_Window* window;
 SDL_Palette* sdlPalette;
 SDL_Renderer* renderer;
 
+SDL_AudioDeviceID device;
+
 char window_title[128];
 int num_args;
 char** arg_values;