- backported a few sound code fixes from Raze.

ZDoom · Feb 15, 2020 · 6aed119 · 6aed119
1 parent 617b6cd
commit 6aed119
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/sound/music/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp
@@ -42,6 +42,7 @@
 #include "filereadermusicinterface.h"
 #include "zmusic/zmusic.h"
 #include "resourcefiles/resourcefile.h"
+#include "version.h"
 
 //==========================================================================
 //
@@ -424,7 +425,7 @@ void FSoundFontManager::CollectSoundfonts()
 
 	if (soundfonts.Size() == 0)
 	{
-		ProcessOneFile(NicePath("$PROGDIR/soundfonts/gzdoom.sf2"));
+		ProcessOneFile(NicePath("$PROGDIR/soundfonts/" GAMENAMELOWERCASE ".sf2"));
 	}
 }
 

diff --git a/src/sound/s_music.cpp b/src/sound/s_music.cpp
@@ -141,7 +141,7 @@ void S_CreateStream()
 	if (!mus_playing.handle) return;
 	SoundStreamInfo fmt;
 	ZMusic_GetStreamInfo(mus_playing.handle, &fmt);
-	if (fmt.mBufferSize > 0)
+	if (fmt.mBufferSize > 0) // if buffer size is 0 the library will play the song itself (e.g. Windows system synth.)
 	{
 		int flags = fmt.mNumChannels < 0 ? 0 : SoundStream::Float;
 		if (abs(fmt.mNumChannels) < 2) flags |= SoundStream::Mono;