From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Tue, 26 Jun 2018 19:24:38 +0000 (+0300)
Subject: Android: added timidity.cfg to game files, so midi music can playing now
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=5bf9c81ca00b024398c0da073fca7d16339a6eaf;p=d2df-sdl.git

Android: added timidity.cfg to game files, so midi music can playing now
---

diff --git a/android/README b/android/README
index b10d352..2d89cb9 100644
--- a/android/README
+++ b/android/README
@@ -18,7 +18,9 @@ Requirements:
 
 Build all shared libraries using NDK toolchain and put into directory ./ass/lib/armeabi-v7a/.
 Also you need to build FPC crosscompiler ( http://wiki.freepascal.org/Android ).
-Put game resources into direcotor resources/ (or install it manually into external/internal storage).
+
+If you want to pack game resources into APK, add it into directory "resources".
+If you want to play MIDI music, add instruments and timidity.cfg into directory "resources" (you can grab it from https://www.libsdl.org/projects/SDL_mixer/timidity/timidity.tar.gz).
 
 Generate keys:
 ```
diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index ca17666..07e63ee 100644
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -29,5 +29,7 @@ public class Doom2DF extends SDLActivity {
 		CopyAssets.copyAssets(SDL.getContext(), "maps");
 		CopyAssets.copyAssets(SDL.getContext(), "maps/megawads");
 		CopyAssets.copyAssets(SDL.getContext(), "wads");
+		CopyAssets.copyAssets(SDL.getContext(), "instruments");
+		CopyAssets.copyAssets(SDL.getContext(), "timidity.cfg");
 	}
 }
diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 3c3c94a..c86d744 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -159,6 +159,7 @@ begin
       exit;
     end;
   end;
+  SetEnvVar('TIMIDITY_CFG', 'timidity.cfg');
 {$ENDIF ANDROID}
 
   for f := 1 to ParamCount do