Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2024-05-15 02:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

AUDIO: Add a basic soundfont for fluidsynth

Browse source 
The soundfont was already included in the Libretro port. It is
now included in all platforms.
This commit is contained in:
Thierry Crozat 2023-11-20 22:53:23 +00:00
parent f47d915ec0
commit 95a060e4fe
11 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -134,7 +134,7 @@ endif
.PHONY: print-dists print-executables print-version print-distversion
print-dists:
@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_PLATFORM) $(srcdir)/doc
@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_PLATFORM) $(srcdir)/doc
print-executables:
@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))

7
Makefile.common
View file

@ -535,4 +535,11 @@ DIST_FILES_SHADERS+=$(wildcard $(srcdir)/engines/freescape/shaders/*)
endif
endif
# Soundfonts
DIST_FILES_SOUNDFONTS=
ifdef USE_FLUIDSYNTH
DIST_FILES_SOUNDFONTS:=$(addprefix $(srcdir)/dists/soundfonts/,Roland_SC-55.sf2)
DIST_FILES_DOCS+=$(addprefix $(srcdir)/dists/soundfonts/,COPYRIGHT.Roland_SC-55)
endif
.PHONY: all clean distclean plugins dist-src clean-toplevel manual

4
backends/platform/android/android.mk
View file

@ -27,9 +27,9 @@ $(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
$(ECHO) "android.enableJetifier=true\n" >> $(PATH_BUILD)/gradle.properties
$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) | $(PATH_BUILD)
$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) | $(PATH_BUILD)
$(INSTALL) -d $(PATH_BUILD_ASSETS)
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) $(PATH_BUILD_ASSETS)/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) $(PATH_BUILD_ASSETS)/
ifneq ($(DIST_FILES_SHADERS),)
$(INSTALL) -d $(PATH_BUILD_ASSETS)/shaders
$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) $(PATH_BUILD_ASSETS)/shaders

3
backends/platform/libretro/scripts/bundle_datafiles.sh
View file

@ -73,11 +73,13 @@ BUNDLE_LOCAL_DATAFILES_DIR="${BUILD_PATH}/dist"
# Retrieve data file info from ScummVM source
THEMES_LIST=$(cat "${SCUMMVM_PATH}/dists/scummvm.rc" 2>/dev/null | grep FILE.*gui/themes.*\* | sed "s|.*\"\(.*\)\"|${SCUMMVM_PATH}/\1|g")
DATAFILES_LIST=$(cat "${SCUMMVM_PATH}/dists/scummvm.rc" 2>/dev/null| grep FILE.*dists/engine-data | sed "s|.*\"\(.*\)\"|${SCUMMVM_PATH}/\1|g")
SOUNDFONTS_LIST=$(cat "${SCUMMVM_PATH}/dists/scummvm.rc" 2>/dev/null| grep FILE.*dists/soundfonts | sed "s|.*\"\(.*\)\"|${SCUMMVM_PATH}/\1|g")
# Put retrieved data into arrays
set +e
read -a THEME_ARRAY -d '' -r <<< "${THEMES_LIST}"
read -a DATAFILES_ARRAY -d '' -r <<< "$DATAFILES_LIST"
read -a SOUNDFONTS_ARRAY -d '' -r <<< "$SOUNDFONTS_LIST"
set -e
# Add specific data files
@ -93,6 +95,7 @@ count=0
# Process datafiles
process_group "$BUNDLE_DATAFILES_DIR" $3 ${DATAFILES_ARRAY[@]}
process_group "$BUNDLE_DATAFILES_DIR" $3 ${SOUNDFONTS_ARRAY[@]}
# Process additional local bundle files
if [ -d "$BUNDLE_LOCAL_DATAFILES_DIR" -a ! -z "$(ls -A ${BUNDLE_LOCAL_DATAFILES_DIR} 2>/dev/null)" ] ; then

3
backends/platform/sdl/switch/switch.mk
View file

@ -13,6 +13,9 @@ endif
ifdef DIST_FILES_ENGINEDATA_BIG
cp $(DIST_FILES_ENGINEDATA_BIG) ./switch_release/scummvm/data
endif
ifdef DIST_FILES_SOUNDFONTS
cp $(DIST_FILES_SOUNDFONTS) ./switch_release/scummvm/data
endif
ifdef DIST_FILES_NETWORKING
cp $(DIST_FILES_NETWORKING) ./switch_release/scummvm/data
endif

5
base/commandLine.cpp
View file

@ -328,6 +328,10 @@ void registerDefaults() {
ConfMan.registerDefault("enable_unsupported_game_warning", true);
#ifdef USE_FLUIDSYNTH
ConfMan.registerDefault("soundfont", "Roland_SC-55.sf2");
#endif
// Game specific
ConfMan.registerDefault("path", "");
ConfMan.registerDefault("platform", Common::kPlatformDOS);
@ -2132,6 +2136,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
ADD_DEFAULT_PATH("themepath", "gui/themes/")
ADD_DEFAULT_PATH("extrapath", "dists/engine-data/")
ADD_DEFAULT_PATH("soundfontpath", "dists/soundfonts/")
#endif
return false;

4
devtools/create_project/xcode.cpp
View file

@ -1150,6 +1150,10 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("engines/freescape/shaders/freescape_triangle.fragment");
files.push_back("engines/freescape/shaders/freescape_triangle.vertex");
}
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
files.push_back("dists/soundfonts/Roland_SC-55.sf2");
files.push_back("dists/soundfonts/COPYRIGHT.Roland_SC-55");
}
files.push_back("icons/scummvm.icns");
files.push_back("AUTHORS");
files.push_back("COPYING");

4
dists/scummvm.rc
View file

@ -31,6 +31,10 @@ encoding.dat FILE "dists/engine-data/encoding.dat"
macgui.dat FILE "dists/engine-data/macgui.dat"
classicmacfonts.dat FILE "dists/engine-data/classicmacfonts.dat"
#ifdef USE_FLUIDSYNTH
Roland_SC-55.sf2 FILE "dists/soundfonts/Roland_SC-55.sf2"
#endif
// Engine or feature specific resources
#ifdef BUILTIN_RESOURCES
#if PLUGIN_ENABLED_STATIC(FREESCAPE)

0
backends/platform/libretro/dist/README.md → dists/soundfonts/COPYRIGHT.Roland_SC-55
View file

0
backends/platform/libretro/dist/Roland_SC-55.sf2 → dists/soundfonts/Roland_SC-55.sf2
View file

14
ports.mk
View file

@ -15,7 +15,7 @@ install-data:
$(INSTALL) -d "$(DESTDIR)$(docdir)"
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
$(INSTALL) -d "$(DESTDIR)$(datadir)"
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) "$(DESTDIR)$(datadir)/"
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) "$(DESTDIR)$(datadir)/"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
$(INSTALL) -c -m 644 "$(srcdir)/dists/org.scummvm.scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/org.scummvm.scummvm.desktop"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/metainfo"
@ -75,6 +75,9 @@ endif
ifdef DIST_FILES_VKEYBD
cp $(DIST_FILES_VKEYBD) ./dist-generic/scummvm/data
endif
ifdef DIST_FILES_SOUNDFONTS
cp $(DIST_FILES_SOUNDFONTS) ./dist-generic/scummvm/data
endif
ifdef DIST_FILES_SHADERS
mkdir -p ./dist-generic/scummvm/data/shaders
cp $(DIST_FILES_SHADERS) ./dist-generic/scummvm/data/shaders
@ -163,6 +166,9 @@ endif
ifdef DIST_FILES_VKEYBD
cp $(DIST_FILES_VKEYBD) $(bundle_name)/Contents/Resources/
endif
ifdef DIST_FILES_SOUNDFONTS
cp $(DIST_FILES_SOUNDFONTS) $(bundle_name)/Contents/Resources/
endif
ifneq ($(DIST_FILES_SHADERS),)
mkdir -p $(bundle_name)/Contents/Resources/shaders
cp $(DIST_FILES_SHADERS) $(bundle_name)/Contents/Resources/shaders/
@ -297,6 +303,9 @@ endif
ifdef DIST_FILES_VKEYBD
cp $(DIST_FILES_VKEYBD) $(bundle_name)/
endif
ifdef DIST_FILES_SOUNDFONTS
cp $(DIST_FILES_SOUNDFONTS) $(bundle_name)/
endif
ifneq ($(DIST_FILES_SHADERS),)
cp $(DIST_FILES_SHADERS) $(bundle_name)/
endif
@ -391,6 +400,9 @@ endif
ifdef DIST_FILES_VKEYBD
cp $(DIST_FILES_VKEYBD) $(bundle_name)/
endif
ifdef DIST_FILES_SOUNDFONTS
cp $(DIST_FILES_SOUNDFONTS) $(bundle_name)/
endif
ifneq ($(DIST_FILES_SHADERS),)
cp $(DIST_FILES_SHADERS) $(bundle_name)/
endif