From 0116eb64f2ee2d8a7a9d3d1db7d0d5cf354770c4 Mon Sep 17 00:00:00 2001 From: craigsc Date: Sat, 11 Jan 2020 17:03:58 -0800 Subject: Default gcw0 back to adlib emulator due to high CPU cost of fluidsynth. I'm leaving fluidsynth in the build because the quality is higher and it does technically work and feel good on several games. Added back in MAD support for MP3 playback for CD-based music tracks on games like Monkey Island 1 - the auto-detection seems to not work correctly for gcw0. Default mixer sampling rate to 48000 due to device driver limitations (this should lower CPU cost since anything other than 48k gets re-sampled) --- backends/mixer/sdl/sdl-mixer.cpp | 2 +- configure | 1 + dists/gcw0/scummvmrc | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp index 2a46d877b2..4dca3923dd 100644 --- a/backends/mixer/sdl/sdl-mixer.cpp +++ b/backends/mixer/sdl/sdl-mixer.cpp @@ -32,7 +32,7 @@ #if defined(GP2X) #define SAMPLES_PER_SEC 11025 -#elif defined(PLAYSTATION3) || defined(PSP2) || defined(NINTENDO_SWITCH) +#elif defined(PLAYSTATION3) || defined(PSP2) || defined(NINTENDO_SWITCH) || defined(GCW0) #define SAMPLES_PER_SEC 48000 #else #define SAMPLES_PER_SEC 44100 diff --git a/configure b/configure index ae01ecc183..6898d55ead 100755 --- a/configure +++ b/configure @@ -3215,6 +3215,7 @@ if test -n "$_host"; then _mt32emu=no _seq_midi=no _timidity=no + _mad=yes _build_scalers=yes _optimization_level=-O3 _vkeybd=yes diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc index f75a56f287..cd9d4f192f 100644 --- a/dists/gcw0/scummvmrc +++ b/dists/gcw0/scummvmrc @@ -8,6 +8,3 @@ extrapath=./engine-data pluginspath=./plugins joystick_num=0 soundfont=./GeneralUser GS FluidSynth v1.44.sf2 -mt32_device=fluidsynth -music_driver=fluidsynth -gm_device=fluidsynth -- cgit v1.2.3