teambeef
/
questzdoom
mirror of https://github.com/DrBeef/QuestZDoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- replaced fluidsynth.sf2 with the default sf2 file in lzdoom asset

This commit is contained in:
Emanuele Disco 2022-04-03 23:50:25 +09:00
parent bf44809a31
commit 97f066669f
7 changed files with 7 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Android/build.gradle
View File

@ -38,7 +38,7 @@ android {
java.srcDirs = ['../../java']
jniLibs.srcDir 'libs'
res.srcDirs = ['../../res']
assets.srcDirs = ['../../assets']
assets.srcDirs = ['../../assets', 'jni/gzdoom-g3.3mgw_mobile/fm_banks', 'jni/gzdoom-g3.3mgw_mobile/soundfont']
}
}
compileOptions {

2
Projects/Android/jni/SupportLibs/fluidsynth-lite/src/Android.mk
View File

@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include/ \
$(LOCAL_PATH)/rvoice \
$(LOCAL_PATH)/midi \
LOCAL_CFLAGS := -DDEFAULT_SOUNDFONT=\"gzdoom.sf2\" -DSUPPORTS_VLA -DHAVE_PTHREAD_H -DHAVE_SYS_STAT_H -DHAVE_STDLIB_H -DHAVE_STDIO_H -DHAVE_MATH_H -DHAVE_STRING_H -DHAVE_STDARG_H -DHAVE_SYS_SOCKET_H -DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DHAVE_NETINET_TCP_H -DHAVE_UNISTD_H -DHAVE_ERRNO_H -DHAVE_FCNTL_H -DVERSION=1.1.6
LOCAL_CFLAGS := -DDEFAULT_SOUNDFONT=\"qzdoom.sf2\" -DSUPPORTS_VLA -DHAVE_PTHREAD_H -DHAVE_SYS_STAT_H -DHAVE_STDLIB_H -DHAVE_STDIO_H -DHAVE_MATH_H -DHAVE_STRING_H -DHAVE_STDARG_H -DHAVE_SYS_SOCKET_H -DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DHAVE_NETINET_TCP_H -DHAVE_UNISTD_H -DHAVE_ERRNO_H -DHAVE_FCNTL_H -DVERSION=1.1.6
LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -fexceptions -frtti

97
assets/snd_fluidsynth/CHANGELOG.txt
View File

@ -1,97 +0,0 @@
GeneralUser GS Revision History
Changes for v1.471
<> Fixed missing chimes (C6) in Power and Orchestral drum kits.
<> Fixed Marimba crashing MuseScore.
Changes for v1.47
<> Unified the FluidSynth and MuseScore versions into a single version now that MuseScore bug #72091 (https://musescore.org/node/72091) has been fixed. This version has also been verified (and slightly tweaked) to work with the latest SynthFont2, which now supports SoundFont 2.01 modulators! Requires SynthFont2 2.0.3.2 or later, or VSTSynthFont 1.081 or later.
Changes for v1.46
<> Fixed high-pitched squeal in Electric Grand
<> Improved kicks and snares in Standard, Standard 2, Room, Power and Electronic drum kits
<> Balanced C5 sample in the Bassoon to fit better with the adjacent samples
<> Improved the Harpsichord and fixed weird loop buzz
<> Improved the Tremolo Strings
<> Slight tweak to attack on Accordion
<> Improved clicking loops in Fretless Bass
<> Fixed bad loops in all strings
<> Fixed Recorder release (it was too short)
<> Fixed weird attack and velocity->filter response in Chiffer Lead
<> Fixed release in upper extreme range of Muted Trumpet
<> Fixed flat loop in Acoustic Bass
Changes for v1.45
<> Tweaked velocity scaling in FluidSynth version to be less extreme between FF and PP playing.
<> Fixed Slap Bass 1 & 2 release to avoid clicks in FluidSynth.
Changes for v1.44
<> New license
<> Fixed loops in Concert Choir
<> Improved Bagpipes
<> FluidSynth/MuseScore version: improved programming of harpsichord, trumpet, trombone, muted trumpet, and pan flute.
<> MuseScore version: adjusted balance of orchestral instruments
<> MuseScore version: modified default drum kit with orchestral bass drum, snare and cymbals.
Changes for v1.43
<> Various improvements
<> Re-worked strings in Live/Audigy version
<> Separate versions for Live/Audigy, FluidSynth and other software synths
<> Removed brand and product name references from presets
Changes for v1.4
<> Countless samples have been replaced, improved, cleaned, re-looped, etc.
<> Just as many instruments have been reworked, rebalanced, etc.
<> Improved overall instrument volume and balance
<> Previous versions of GeneralUser GS only allowed 20% of the total reverb and chorus effects to be used (this is the default setting in the SoundFont specification). Setting reverb (CC91) or chorus (CC93) to max value (127) now allows 100% of the effect to be heard.
<> Added self-test mode (activated by playing "GUTest.mid")
<> There are too many improvements in this bank to list, you will have to hear it for yourself :)
Changes for v1.35
<> Made compatible with Sound Blaster Audigy and EMU APS.
<> Minor tweaks.
Changes for v1.3
<> Combined AWE32/64 and Live! versions into one bank compatible with both sound cards.
<> Resampled Marimba.
<> Standard snare now sounds much more realistic.
<> Cymbals act appropriately when played soft, making decent-sounding cymbal rolls possible.
<> Replaced Synth Brass 1, Square Lead and Sawtooth lead. The old Square Lead and Sawtooth lead can be found in bank 12.
<> Countless other modifications to instruments in the bank, including balance fixes.
Changes for v1.2
Both versions:
<> Adjusted piano 1 and 2 brightness.
<> Adjusted tuning of Marimba -- attack still sounds strange in Live! version, can't figure out why.
<> Fixed crackling in Clean Guitar (and variants).
<> Increased volume of high Trumpet notes.
<> Other small changes.
Live! version:
<> Fixed Hi-hat cutoff bug that showed up courtesy of the Creative Labs driver.
<> Fixed bad attack on Harpsichord sound.
<> Fixed some more synth sounds that weren't right because the Live! driver screwed up the filter settings.
Changes for v1.1
Both versions:
<> Reworked the string ensemble using same samples. Sounds more full now and is in stereo.
<> Adjusted balance/envelopes of some woodwinds.
<> Made orchestral snare velocity sensitive.
<> Other small tweaks here and there.
Live! version:
<> Fixed some synth sounds that weren't right because the Live! driver screwed up the filter settings.

25
assets/snd_fluidsynth/LICENSE.txt
View File

@ -1,25 +0,0 @@
*** GeneralUser GS v1.471 ***
*** License v2.0 ***
** License of the complete work **
You may use GeneralUser GS without restriction for your own music creation, private or commercial. This SoundFont bank is provided to the community free of charge. Please feel free to use it in your software projects, and to modify the SoundFont bank or its packaging to suit your needs.
** License of contained samples **
GeneralUser GS inherits the usage rights of the samples contained within, all of which allow full use in music production, including the ability to make profit from musical recordings created with GeneralUser GS.
Many of the samples are original, but some were taken from other banks freely (and legally) available on the Internet from various SoundFont websites. Because GeneralUser GS originated as a personal project with no intention for publication, I cannot be 100% sure where all of the samples originated, although I do know that none of them came from commercially published SoundFont packages or sample CDs. Regardless, many "free" SoundFonts available on the web may indeed contain samples of questionable origin. My understanding of the copyrights of all samples is only as good as the information provided by the original sources. If you become aware of any restricted samples being used in GeneralUser GS, please let me know so I can replace them.
This uncertainty may concern you if you intend to use GeneralUser GS in a commercial software product. That being said, I have never received any complaint regarding sample ownership since I published the original GeneralUser GS back in 2000, and as far as I am aware, neither have any of the companies creating commercial software products using GeneralUser GS.
** More info **
If you plan to feature GeneralUser GS on your own website, please do not link directly to my download files. Either link to my website, or provide your own local copy instead.
I hope you enjoy GeneralUser GS! This SoundFont bank is the product of many years of hard work.
You can find updates to GeneralUser GS and more of my virtual instruments at:
http://www.schristiancollins.com
I can be reached at: s_chriscollins@hotmail.com.
Thank you!
-~Chris

41
assets/snd_fluidsynth/README.txt
View File

@ -1,41 +0,0 @@
*********************************
*** GeneralUser GS v1.471 ***
*** By S. Christian Collins ***
*** 2/7/2017 ***
*********************************
GeneralUser GS is a GM and GS compatible SoundFont bank for composing, playing MIDI files, and retro gaming. It features 259 instrument presets and 11 drum kits, all while possessing a very low memory footprint (less than 30 MB of RAM). Due to its clever, detailed sound programming, GeneralUser GS can sound as good or better than SoundFonts that are 2-3 times its size.
I decided on the name "GeneralUser" because the bank was designed to sound well with all kinds of music rather than specializing in only a few styles, thereby benefiting the general user. It's not a great name, but that's what I came up with almost 20 years ago, and I haven't bothered to change it.
+---------------+
| Compatibility |
+---------------+
Although GeneralUser GS was originally designed for use with Sound Blaster audio cards, the most recent development has been focused on SoundFont-compatible software instead. The current version of GeneralUser GS requires a SoundFont synth with support for SoundFont 2.01 modulators. Compatible synths include FluidSynth 1.0.9 or later (and other software that uses FluidSynth such as Qsynth, LMMS, and ScummVM, just to name a few), MuseScore 2.0.3 or later, SynthFont2 2.0.3.0 or later, and VSTSynthFont 1.080 or later.
While the current version of GeneralUser GS can be used with the hardware synthesizer found in many Sound Blaster audio cards, you will achieve better results using a version that was designed especially for this hardware (available at http://www.schristiancollins.com/generaluser.php).
Most other SoundFont synths do not support all of the programming I have used in GeneralUser GS and will cause many of the presets to sound incorrect. For these unsupported SoundFont synths, you can download an older "SoftSynth" version of GeneralUser GS from my website that cuts out a lot of the special programming and is less likely to result in broken-sounding presets.
+--------------+
| Installation |
+--------------+
Please follow your synth/sound card's documentation for instructions on loading GeneralUser GS as the default GM/GS bank. This usually requires GeneralUser GS to be loaded into bank 0, and any other SoundFonts loaded into bank 0 to be removed prior.
+---------------+
| Miscellaneous |
+---------------+
Instrument list files are currently provided for Cakewalk SONAR (Windows) and Rosegarden (Linux) sequencers in the "instrument lists" folder. If you create an instrument list for any other sequencers, please e-mail them to me at s_chriscollins@hotmail.com and I will include them in the next release package.
I have also provided some free MIDI files in the "demo MIDIs" folder for your listening enjoyment. Please feel free to send me more of those as well :)
You can find updates to GeneralUser GS and more of my virtual instruments at http://www.schristiancollins.com. I can be reached at s_chriscollins@hotmail.com, but please don't send me questions that are easily answered by your sound hardware/software's documentation. I won't have time to answer every question that I receive.
Thank you!
-~Chris Collins

BIN
assets/snd_fluidsynth/fluidsynth.sf2
View File

Binary file not shown.

7
java/com/drbeef/questzdoom/GLES3JNIActivity.java
View File

@ -173,7 +173,7 @@ import java.io.OutputStream;
new File("/sdcard/QuestZDoom/res").mkdirs();
new File("/sdcard/QuestZDoom/mods").mkdirs();
new File("/sdcard/QuestZDoom/wads").mkdirs();
new File("/sdcard/QuestZDoom/audiopack/snd_fluidsynth").mkdirs();
new File("/sdcard/QuestZDoom/soundfonts").mkdirs();
copy_asset("/sdcard/QuestZDoom", "res/lzdoom.pk3", true);
copy_asset("/sdcard/QuestZDoom", "res/lz_game_support.pk3", true);
@ -183,7 +183,10 @@ import java.io.OutputStream;
copy_asset("/sdcard/QuestZDoom", "mods/Ultimate-Cheat-Menu.zip", true);
copy_asset("/sdcard/QuestZDoom", "mods/laser-sight-0.5.5-vr.pk3", true);
copy_asset("/sdcard/QuestZDoom/audiopack", "snd_fluidsynth/fluidsynth.sf2", false);
copy_asset("/sdcard/QuestZDoom/soundfonts", "qzdoom.sf2", false);
copy_asset("/sdcard/QuestZDoom/fm_banks", "GENMIDI.GS.wopl", false);
copy_asset("/sdcard/QuestZDoom/fm_banks", "gs-by-papiezak-and-sneakernets.wopn", false);
//copy_asset("/sdcard/QuestZDoom/audiopack", "snd_fluidsynth/fluidsynth.sf2", false);
//Read these from a file and pass through
commandLineParams = new String("qzdoom");