Add support for the MIDI playback

ihhub · Jan 4, 2025 · ae788dd · ae788dd
1 parent b310179
commit ae788dd
Show file tree

Hide file tree

Showing 93 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -92,7 +92,7 @@ android/.idea
 android/.gradle
 
 # Automatically created Android assets
-android/app/src/main/assets/files/
+android/app/src/main/assets/
 
 # Mac magic folders
 .DS_Store

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -99,6 +99,14 @@ tasks.register('copyH2D', Copy) {
     into 'src/main/assets/files/data'
 }
 
+tasks.register('copyTimidity', Copy) {
+    from('../../files/timidity') {
+        include 'instruments/*.pat'
+        include 'timidity.cfg'
+    }
+    into 'src/main/assets'
+}
+
 tasks.register('copyTranslations', Copy) {
     from('../../files/lang') {
         include '*.mo'
@@ -107,5 +115,5 @@ tasks.register('copyTranslations', Copy) {
 }
 
 preBuild {
-    dependsOn copyH2D, copyTranslations
+    dependsOn copyH2D, copyTimidity, copyTranslations
 }
diff --git a/...pp/src/main/assets/instruments/README.txt → files/timidity/instruments/README.txt b/...pp/src/main/assets/instruments/README.txt → files/timidity/instruments/README.txt
diff --git a/...p/src/main/assets/instruments/acpiano.pat → files/timidity/instruments/acpiano.pat b/...p/src/main/assets/instruments/acpiano.pat → files/timidity/instruments/acpiano.pat
diff --git a/...p/src/main/assets/instruments/agogohi.pat → files/timidity/instruments/agogohi.pat b/...p/src/main/assets/instruments/agogohi.pat → files/timidity/instruments/agogohi.pat
diff --git a/...p/src/main/assets/instruments/agogolo.pat → files/timidity/instruments/agogolo.pat b/...p/src/main/assets/instruments/agogolo.pat → files/timidity/instruments/agogolo.pat
diff --git a/...p/src/main/assets/instruments/bassoon.pat → files/timidity/instruments/bassoon.pat b/...p/src/main/assets/instruments/bassoon.pat → files/timidity/instruments/bassoon.pat
diff --git a/.../src/main/assets/instruments/belltree.pat → files/timidity/instruments/belltree.pat b/.../src/main/assets/instruments/belltree.pat → files/timidity/instruments/belltree.pat
diff --git a/...p/src/main/assets/instruments/bongohi.pat → files/timidity/instruments/bongohi.pat b/...p/src/main/assets/instruments/bongohi.pat → files/timidity/instruments/bongohi.pat
diff --git a/...p/src/main/assets/instruments/bongolo.pat → files/timidity/instruments/bongolo.pat b/...p/src/main/assets/instruments/bongolo.pat → files/timidity/instruments/bongolo.pat
diff --git a/.../src/main/assets/instruments/bowglass.pat → files/timidity/instruments/bowglass.pat b/.../src/main/assets/instruments/bowglass.pat → files/timidity/instruments/bowglass.pat
diff --git a/...pp/src/main/assets/instruments/cabasa.pat → files/timidity/instruments/cabasa.pat b/...pp/src/main/assets/instruments/cabasa.pat → files/timidity/instruments/cabasa.pat
diff --git a/.../src/main/assets/instruments/castinet.pat → files/timidity/instruments/castinet.pat b/.../src/main/assets/instruments/castinet.pat → files/timidity/instruments/castinet.pat
diff --git a/...app/src/main/assets/instruments/cello.pat → files/timidity/instruments/cello.pat b/...app/src/main/assets/instruments/cello.pat → files/timidity/instruments/cello.pat
diff --git a/...app/src/main/assets/instruments/choir.pat → files/timidity/instruments/choir.pat b/...app/src/main/assets/instruments/choir.pat → files/timidity/instruments/choir.pat
diff --git a/...pp/src/main/assets/instruments/church.pat → files/timidity/instruments/church.pat b/...pp/src/main/assets/instruments/church.pat → files/timidity/instruments/church.pat
diff --git a/...app/src/main/assets/instruments/claps.pat → files/timidity/instruments/claps.pat b/...app/src/main/assets/instruments/claps.pat → files/timidity/instruments/claps.pat
diff --git a/.../src/main/assets/instruments/clarinet.pat → files/timidity/instruments/clarinet.pat b/.../src/main/assets/instruments/clarinet.pat → files/timidity/instruments/clarinet.pat
diff --git a/...app/src/main/assets/instruments/clave.pat → files/timidity/instruments/clave.pat b/...app/src/main/assets/instruments/clave.pat → files/timidity/instruments/clave.pat
diff --git a/.../src/main/assets/instruments/congahi1.pat → files/timidity/instruments/congahi1.pat b/.../src/main/assets/instruments/congahi1.pat → files/timidity/instruments/congahi1.pat
diff --git a/.../src/main/assets/instruments/congahi2.pat → files/timidity/instruments/congahi2.pat b/.../src/main/assets/instruments/congahi2.pat → files/timidity/instruments/congahi2.pat
diff --git a/...p/src/main/assets/instruments/congalo.pat → files/timidity/instruments/congalo.pat b/...p/src/main/assets/instruments/congalo.pat → files/timidity/instruments/congalo.pat
diff --git a/.../src/main/assets/instruments/contraba.pat → files/timidity/instruments/contraba.pat b/.../src/main/assets/instruments/contraba.pat → files/timidity/instruments/contraba.pat
diff --git a/...p/src/main/assets/instruments/cowbell.pat → files/timidity/instruments/cowbell.pat b/...p/src/main/assets/instruments/cowbell.pat → files/timidity/instruments/cowbell.pat
diff --git a/...pp/src/main/assets/instruments/cuica1.pat → files/timidity/instruments/cuica1.pat b/...pp/src/main/assets/instruments/cuica1.pat → files/timidity/instruments/cuica1.pat
diff --git a/...pp/src/main/assets/instruments/cuica2.pat → files/timidity/instruments/cuica2.pat b/...pp/src/main/assets/instruments/cuica2.pat → files/timidity/instruments/cuica2.pat
diff --git a/...p/src/main/assets/instruments/cymbell.pat → files/timidity/instruments/cymbell.pat b/...p/src/main/assets/instruments/cymbell.pat → files/timidity/instruments/cymbell.pat
diff --git a/.../src/main/assets/instruments/cymchina.pat → files/timidity/instruments/cymchina.pat b/.../src/main/assets/instruments/cymchina.pat → files/timidity/instruments/cymchina.pat
diff --git a/.../src/main/assets/instruments/cymcrsh1.pat → files/timidity/instruments/cymcrsh1.pat b/.../src/main/assets/instruments/cymcrsh1.pat → files/timidity/instruments/cymcrsh1.pat
diff --git a/.../src/main/assets/instruments/cymcrsh2.pat → files/timidity/instruments/cymcrsh2.pat b/.../src/main/assets/instruments/cymcrsh2.pat → files/timidity/instruments/cymcrsh2.pat
diff --git a/.../src/main/assets/instruments/cymride1.pat → files/timidity/instruments/cymride1.pat b/.../src/main/assets/instruments/cymride1.pat → files/timidity/instruments/cymride1.pat
diff --git a/.../src/main/assets/instruments/cymride2.pat → files/timidity/instruments/cymride2.pat b/.../src/main/assets/instruments/cymride2.pat → files/timidity/instruments/cymride2.pat
diff --git a/.../src/main/assets/instruments/cymsplsh.pat → files/timidity/instruments/cymsplsh.pat b/.../src/main/assets/instruments/cymsplsh.pat → files/timidity/instruments/cymsplsh.pat
diff --git a/.../src/main/assets/instruments/englhorn.pat → files/timidity/instruments/englhorn.pat b/.../src/main/assets/instruments/englhorn.pat → files/timidity/instruments/englhorn.pat
diff --git a/...app/src/main/assets/instruments/flute.pat → files/timidity/instruments/flute.pat b/...app/src/main/assets/instruments/flute.pat → files/timidity/instruments/flute.pat
diff --git a/.../src/main/assets/instruments/frenchrn.pat → files/timidity/instruments/frenchrn.pat b/.../src/main/assets/instruments/frenchrn.pat → files/timidity/instruments/frenchrn.pat
diff --git a/...pp/src/main/assets/instruments/guiro1.pat → files/timidity/instruments/guiro1.pat b/...pp/src/main/assets/instruments/guiro1.pat → files/timidity/instruments/guiro1.pat
diff --git a/...pp/src/main/assets/instruments/guiro2.pat → files/timidity/instruments/guiro2.pat b/...pp/src/main/assets/instruments/guiro2.pat → files/timidity/instruments/guiro2.pat
diff --git a/.../app/src/main/assets/instruments/harp.pat → files/timidity/instruments/harp.pat b/.../app/src/main/assets/instruments/harp.pat → files/timidity/instruments/harp.pat
diff --git a/...app/src/main/assets/instruments/highq.pat → files/timidity/instruments/highq.pat b/...app/src/main/assets/instruments/highq.pat → files/timidity/instruments/highq.pat
diff --git a/...p/src/main/assets/instruments/hihatcl.pat → files/timidity/instruments/hihatcl.pat b/...p/src/main/assets/instruments/hihatcl.pat → files/timidity/instruments/hihatcl.pat
diff --git a/...p/src/main/assets/instruments/hihatop.pat → files/timidity/instruments/hihatop.pat b/...p/src/main/assets/instruments/hihatop.pat → files/timidity/instruments/hihatop.pat
diff --git a/...p/src/main/assets/instruments/hihatpd.pat → files/timidity/instruments/hihatpd.pat b/...p/src/main/assets/instruments/hihatpd.pat → files/timidity/instruments/hihatpd.pat
diff --git a/.../src/main/assets/instruments/hrpschrd.pat → files/timidity/instruments/hrpschrd.pat b/.../src/main/assets/instruments/hrpschrd.pat → files/timidity/instruments/hrpschrd.pat
diff --git a/...p/src/main/assets/instruments/jingles.pat → files/timidity/instruments/jingles.pat b/...p/src/main/assets/instruments/jingles.pat → files/timidity/instruments/jingles.pat
diff --git a/...app/src/main/assets/instruments/kick1.pat → files/timidity/instruments/kick1.pat b/...app/src/main/assets/instruments/kick1.pat → files/timidity/instruments/kick1.pat
diff --git a/...app/src/main/assets/instruments/kick2.pat → files/timidity/instruments/kick2.pat b/...app/src/main/assets/instruments/kick2.pat → files/timidity/instruments/kick2.pat
diff --git a/...p/src/main/assets/instruments/maracas.pat → files/timidity/instruments/maracas.pat b/...p/src/main/assets/instruments/maracas.pat → files/timidity/instruments/maracas.pat
diff --git a/...p/src/main/assets/instruments/marcato.pat → files/timidity/instruments/marcato.pat b/...p/src/main/assets/instruments/marcato.pat → files/timidity/instruments/marcato.pat
diff --git a/...p/src/main/assets/instruments/metbell.pat → files/timidity/instruments/metbell.pat b/...p/src/main/assets/instruments/metbell.pat → files/timidity/instruments/metbell.pat
diff --git a/.../src/main/assets/instruments/metclick.pat → files/timidity/instruments/metclick.pat b/.../src/main/assets/instruments/metclick.pat → files/timidity/instruments/metclick.pat
diff --git a/.../src/main/assets/instruments/nyguitar.pat → files/timidity/instruments/nyguitar.pat b/.../src/main/assets/instruments/nyguitar.pat → files/timidity/instruments/nyguitar.pat
diff --git a/.../app/src/main/assets/instruments/oboe.pat → files/timidity/instruments/oboe.pat b/.../app/src/main/assets/instruments/oboe.pat → files/timidity/instruments/oboe.pat
diff --git a/...p/src/main/assets/instruments/piccolo.pat → files/timidity/instruments/piccolo.pat b/...p/src/main/assets/instruments/piccolo.pat → files/timidity/instruments/piccolo.pat
diff --git a/.../src/main/assets/instruments/pizzcato.pat → files/timidity/instruments/pizzcato.pat b/.../src/main/assets/instruments/pizzcato.pat → files/timidity/instruments/pizzcato.pat
diff --git a/.../src/main/assets/instruments/scratch1.pat → files/timidity/instruments/scratch1.pat b/.../src/main/assets/instruments/scratch1.pat → files/timidity/instruments/scratch1.pat
diff --git a/.../src/main/assets/instruments/scratch2.pat → files/timidity/instruments/scratch2.pat b/.../src/main/assets/instruments/scratch2.pat → files/timidity/instruments/scratch2.pat
diff --git a/...pp/src/main/assets/instruments/shaker.pat → files/timidity/instruments/shaker.pat b/...pp/src/main/assets/instruments/shaker.pat → files/timidity/instruments/shaker.pat
diff --git a/.../app/src/main/assets/instruments/slap.pat → files/timidity/instruments/slap.pat b/.../app/src/main/assets/instruments/slap.pat → files/timidity/instruments/slap.pat
diff --git a/...p/src/main/assets/instruments/slowstr.pat → files/timidity/instruments/slowstr.pat b/...p/src/main/assets/instruments/slowstr.pat → files/timidity/instruments/slowstr.pat
diff --git a/.../app/src/main/assets/instruments/snap.pat → files/timidity/instruments/snap.pat b/.../app/src/main/assets/instruments/snap.pat → files/timidity/instruments/snap.pat
diff --git a/...pp/src/main/assets/instruments/snare1.pat → files/timidity/instruments/snare1.pat b/...pp/src/main/assets/instruments/snare1.pat → files/timidity/instruments/snare1.pat
diff --git a/...pp/src/main/assets/instruments/snare2.pat → files/timidity/instruments/snare2.pat b/...pp/src/main/assets/instruments/snare2.pat → files/timidity/instruments/snare2.pat
diff --git a/.../src/main/assets/instruments/snarerol.pat → files/timidity/instruments/snarerol.pat b/.../src/main/assets/instruments/snarerol.pat → files/timidity/instruments/snarerol.pat
diff --git a/.../src/main/assets/instruments/sqrclick.pat → files/timidity/instruments/sqrclick.pat b/.../src/main/assets/instruments/sqrclick.pat → files/timidity/instruments/sqrclick.pat
diff --git a/.../src/main/assets/instruments/stickrim.pat → files/timidity/instruments/stickrim.pat b/.../src/main/assets/instruments/stickrim.pat → files/timidity/instruments/stickrim.pat
diff --git a/...pp/src/main/assets/instruments/sticks.pat → files/timidity/instruments/sticks.pat b/...pp/src/main/assets/instruments/sticks.pat → files/timidity/instruments/sticks.pat
diff --git a/...pp/src/main/assets/instruments/surdo1.pat → files/timidity/instruments/surdo1.pat b/...pp/src/main/assets/instruments/surdo1.pat → files/timidity/instruments/surdo1.pat
diff --git a/...pp/src/main/assets/instruments/surdo2.pat → files/timidity/instruments/surdo2.pat b/...pp/src/main/assets/instruments/surdo2.pat → files/timidity/instruments/surdo2.pat
diff --git a/...p/src/main/assets/instruments/synstr2.pat → files/timidity/instruments/synstr2.pat b/...p/src/main/assets/instruments/synstr2.pat → files/timidity/instruments/synstr2.pat
diff --git a/...app/src/main/assets/instruments/taiko.pat → files/timidity/instruments/taiko.pat b/...app/src/main/assets/instruments/taiko.pat → files/timidity/instruments/taiko.pat
diff --git a/.../src/main/assets/instruments/tamborin.pat → files/timidity/instruments/tamborin.pat b/.../src/main/assets/instruments/tamborin.pat → files/timidity/instruments/tamborin.pat
diff --git a/.../src/main/assets/instruments/timbaleh.pat → files/timidity/instruments/timbaleh.pat b/.../src/main/assets/instruments/timbaleh.pat → files/timidity/instruments/timbaleh.pat
diff --git a/.../src/main/assets/instruments/timbalel.pat → files/timidity/instruments/timbalel.pat b/.../src/main/assets/instruments/timbalel.pat → files/timidity/instruments/timbalel.pat
diff --git a/...p/src/main/assets/instruments/timpani.pat → files/timidity/instruments/timpani.pat b/...p/src/main/assets/instruments/timpani.pat → files/timidity/instruments/timpani.pat
diff --git a/...pp/src/main/assets/instruments/tomhi1.pat → files/timidity/instruments/tomhi1.pat b/...pp/src/main/assets/instruments/tomhi1.pat → files/timidity/instruments/tomhi1.pat
diff --git a/...pp/src/main/assets/instruments/tomhi2.pat → files/timidity/instruments/tomhi2.pat b/...pp/src/main/assets/instruments/tomhi2.pat → files/timidity/instruments/tomhi2.pat
diff --git a/...pp/src/main/assets/instruments/tomlo1.pat → files/timidity/instruments/tomlo1.pat b/...pp/src/main/assets/instruments/tomlo1.pat → files/timidity/instruments/tomlo1.pat
diff --git a/...pp/src/main/assets/instruments/tomlo2.pat → files/timidity/instruments/tomlo2.pat b/...pp/src/main/assets/instruments/tomlo2.pat → files/timidity/instruments/tomlo2.pat
diff --git a/...p/src/main/assets/instruments/tommid1.pat → files/timidity/instruments/tommid1.pat b/...p/src/main/assets/instruments/tommid1.pat → files/timidity/instruments/tommid1.pat
diff --git a/...p/src/main/assets/instruments/tommid2.pat → files/timidity/instruments/tommid2.pat b/...p/src/main/assets/instruments/tommid2.pat → files/timidity/instruments/tommid2.pat
diff --git a/...p/src/main/assets/instruments/tremstr.pat → files/timidity/instruments/tremstr.pat b/...p/src/main/assets/instruments/tremstr.pat → files/timidity/instruments/tremstr.pat
diff --git a/.../src/main/assets/instruments/triangl1.pat → files/timidity/instruments/triangl1.pat b/.../src/main/assets/instruments/triangl1.pat → files/timidity/instruments/triangl1.pat
diff --git a/.../src/main/assets/instruments/triangl2.pat → files/timidity/instruments/triangl2.pat b/.../src/main/assets/instruments/triangl2.pat → files/timidity/instruments/triangl2.pat
diff --git a/.../src/main/assets/instruments/trombone.pat → files/timidity/instruments/trombone.pat b/.../src/main/assets/instruments/trombone.pat → files/timidity/instruments/trombone.pat
diff --git a/...p/src/main/assets/instruments/vibslap.pat → files/timidity/instruments/vibslap.pat b/...p/src/main/assets/instruments/vibslap.pat → files/timidity/instruments/vibslap.pat
diff --git a/...app/src/main/assets/instruments/viola.pat → files/timidity/instruments/viola.pat b/...app/src/main/assets/instruments/viola.pat → files/timidity/instruments/viola.pat
diff --git a/.../src/main/assets/instruments/whistle1.pat → files/timidity/instruments/whistle1.pat b/.../src/main/assets/instruments/whistle1.pat → files/timidity/instruments/whistle1.pat
diff --git a/.../src/main/assets/instruments/whistle2.pat → files/timidity/instruments/whistle2.pat b/.../src/main/assets/instruments/whistle2.pat → files/timidity/instruments/whistle2.pat
diff --git a/.../src/main/assets/instruments/woodblk1.pat → files/timidity/instruments/woodblk1.pat b/.../src/main/assets/instruments/woodblk1.pat → files/timidity/instruments/woodblk1.pat
diff --git a/.../src/main/assets/instruments/woodblk2.pat → files/timidity/instruments/woodblk2.pat b/.../src/main/assets/instruments/woodblk2.pat → files/timidity/instruments/woodblk2.pat
diff --git a/android/app/src/main/assets/timidity.cfg → files/timidity/timidity.cfg b/android/app/src/main/assets/timidity.cfg → files/timidity/timidity.cfg
diff --git a/src/dist/Makefile.emscripten b/src/dist/Makefile.emscripten
@@ -27,12 +27,13 @@ CCFLAGS := $(filter-out -pthread,$(CCFLAGS)) \
 LDFLAGS := $(filter-out -pthread,$(LDFLAGS)) \
 	--preload-file ../../../files/data/resurrection.h2d@/files/data/resurrection.h2d \
 	--preload-file ../../../files/lang/@/files/lang/ \
-	--preload-file ../../../files/soundfonts/fheroes2.sf3@/files/soundfonts/fheroes2.sf3 \
+	--preload-file ../../../files/timidity/@/etc/ \
 	-sASYNCIFY \
 	-sASYNCIFY_STACK_SIZE=20480 \
 	-sENVIRONMENT=web \
 	-sINITIAL_MEMORY=128mb \
 	-sNO_DISABLE_EXCEPTION_CATCHING \
+	-sSDL2_MIXER_FORMATS=mid,mp3,ogg \
 	-sSTACK_SIZE=262144 \
 	-lidbfs.js