[Scummvm-cvs-logs] CVS: scummvm NEWS,1.111,1.112 README,1.318,1.319 TODO,1.263,1.264 configure,1.115,1.116
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Sun Apr 10 07:34:27 CEST 2005
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11090
Modified Files:
NEWS README TODO configure
Log Message:
Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation
changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.
Index: NEWS
===================================================================
RCS file: /cvsroot/scummvm/scummvm/NEWS,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- NEWS 5 Apr 2005 15:07:37 -0000 1.111
+++ NEWS 10 Apr 2005 14:33:41 -0000 1.112
@@ -10,6 +10,7 @@
General:
- Reworked cursor handling in SDL backend. Now cursors can have their own
palette and scaling. This is used by Humongous Entertainment games now.
+ - Added FluidSynth MIDI driver.
SCUMM:
- Added support for Mac Humongous Entertainment titles
Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/README,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- README 12 Mar 2005 00:52:52 -0000 1.318
+++ README 10 Apr 2005 14:33:41 -0000 1.319
@@ -31,12 +31,13 @@
* 6.1 Autosaves
7.0) Music and Sound
* 7.1 Adlib emulation
- * 7.2 MT-32 emulation
- * 7.3 MIDI emulation
- * 7.4 Native MIDI support
- * 7.5 UNIX native & ALSA sequencer support
- * 7.6 Using compressed audiofiles (MP3, Ogg Vorbis, Flac)
- * 7.7 Output sample rate
+ * 7.2 FluidSynth MIDI emulation
+ * 7.3 MT-32 emulation
+ * 7.4 MIDI emulation
+ * 7.5 Native MIDI support
+ * 7.6 UNIX native & ALSA sequencer support
+ * 7.7 Using compressed audiofiles (MP3, Ogg Vorbis, Flac)
+ * 7.8 Output sample rate
8.0) Configuration Files
9.0) Compiling
@@ -369,6 +370,8 @@
--platform=WORD Specify version of game (allowed values: amiga,
atari, fmtowns, mac, pc, windows)
--savepath=PATH Path to where savegames are stored
+ --soundfont=FILE Select the SoundFont for MIDI playback. (Only
+ supported by some MIDI drivers.)
--multi-midi Enable combination of Adlib and native MIDI
--native-mt32 True Roland MT-32 (disable GM emulation)
--output-rate=RATE Select output sample rate in Hz (e.g. 22050)
@@ -705,20 +708,21 @@
manual configuration. If you ARE using MIDI, you have several different
choices of output, depending on your operating system and configuration.
- null - Null output. Don't play any music.
+ null - Null output. Don't play any music.
- adlib - Internal Adlib emulation (default)
- mt32 - Internal MT-32 emulation
- pcjr - Internal PCjr emulation
- pcspk - Internal PC Speaker emulation
- towns - Internal FM-TOWNS YM2612 emulation
+ adlib - Internal Adlib emulation (default)
+ fluidsynth - FluidSynth MIDI emulation
+ mt32 - Internal MT-32 emulation
+ pcjr - Internal PCjr emulation
+ pcspk - Internal PC Speaker emulation
+ towns - Internal FM-TOWNS YM2612 emulation
- alsa - Output using ALSA sequencer device. See below.
- amidi - Use the MorphOS MIDI system, for MorphOS users
- core - CoreAudio sound, for Mac OS X users.
- qt - Quicktime sound, for Macintosh users.
- seq - Use /dev/sequencer for MIDI, *nix users. See below.
- windows - Windows MIDI. Uses built-in sequencer, for Windows users
+ alsa - Output using ALSA sequencer device. See below.
+ amidi - Use the MorphOS MIDI system, for MorphOS users
+ core - CoreAudio sound, for Mac OS X users.
+ qt - Quicktime sound, for Macintosh users.
+ seq - Use /dev/sequencer for MIDI, *nix users. See below.
+ windows - Windows MIDI. Uses built-in sequencer, for Windows users
To select a sound driver, pass its name via the '-e' option to scummvm,
for example:
@@ -732,7 +736,18 @@
as sampled waves. This is the default mode for most games, and offers the
best compatibility between machines and games.
-7.2) Playing sound with MT-32 emulation:
+
+7.2) Playing sound with FluildSynth MIDI emulation:
+---- ----------------------------------------------
+If ScummVM was build with libfluildsynth support it will be able to play MIDI
+music through the FluidSynth driver. You will have to specify a SoundFont to
+use, however.
+
+NOTE: The processor requirements for FluidSynth can be fairly high in some
+cases. A fast CPU is recommended.
+
+
+7.3) Playing sound with MT-32 emulation:
---- -----------------------------------
Some games which contain MIDI music data also have improved tracks designed
for the MT-32 sound module. ScummVM can now emulate this device, however you
@@ -749,25 +764,27 @@
NOTE: The processor requirements for the emulator are quite high; a fast CPU is
strongly recommended.
-7.3) Playing sound with MIDI emulation:
+
+7.4) Playing sound with MIDI emulation:
---- ----------------------------------
Some games (such as Sam and Max) only contain MIDI music data. This once
prevented music for these games from working on platforms that do not support
MIDI, or soundcards that do not provide MIDI drivers (e.g, many soundcards will
not play MIDI under Linux). ScummVM can now emulate MIDI mode using sampled
-waves and Adlib or MT-32 emulation using the -eadlib or -emt32 options
-respectively. However, if you are capable of using native MIDI, we recommend
-using one of the MIDI modes below for best sound.
+waves and Adlib, FluidSynth MIDI emulation or MT-32 emulation using the
+-eadlib, -efluidsynth or -emt32 options respectively. However, if you are
+capable of using native MIDI, we recommend using one of the MIDI modes below
+for best sound.
-7.4) Playing sound with Native MIDI:
+7.5) Playing sound with Native MIDI:
---- -------------------------------
Use the appropriate -e<mode> command line option from the list above to
select your preferred MIDI device. For example, if you wish to use the
Windows MIDI driver, use the -ewindows option.
-7.5.0) Playing sound with Sequencer MIDI: [UNIX ONLY]
+7.6.0) Playing sound with Sequencer MIDI: [UNIX ONLY]
------ ----------------------------------
If your soundcard driver supports a sequencer, you may set the environment
variable "SCUMMVM_MIDI" to your sequencer device - e.g., /dev/sequencer
@@ -780,7 +797,7 @@
sequencer support does not work, you can always fall back on Adlib emulation.
-7.5.1) Playing sound with ALSA sequencer: [UNIX ONLY]
+7.6.1) Playing sound with ALSA sequencer: [UNIX ONLY]
------ ----------------------------------
If you have installed the ALSA driver with the sequencer support, then
set the environment variable SCUMMVM_PORT or the config file parameter
@@ -829,7 +846,7 @@
Once either TiMidity or FluidSynth are running, use the 'aconnect -o -l'
command as described earlier in this section.
-7.6.0) Using MP3 files for CD audio:
+7.7.0) Using MP3 files for CD audio:
------ -----------------------------
Use LAME or some other MP3 encoder to rip the cd audio tracks to files. Name
the files track1.mp3 track2.mp3 etc. ScummVM must be compiled with MAD support
@@ -840,7 +857,7 @@
lame -t -q 0 -b 96 track1.wav track1.mp3
-7.6.1) Using Ogg Vorbis files for CD audio:
+7.7.1) Using Ogg Vorbis files for CD audio:
------ ------------------------------------
Use oggenc or some other vorbis encoder to encode the audio tracks to files.
Name the files track1.ogg track2.ogg etc. ScummVM must be compiled with vorbis
@@ -851,7 +868,7 @@
oggenc -q 5 track1.wav
-7.6.2) Using Flac files for CD audio:
+7.7.2) Using Flac files for CD audio:
------ ------------------------------------
Use flac or some other flac encoder to encode the audio tracks to files.
Name the files track1.flac track2.flac etc. In your filesystem only allows
@@ -866,7 +883,7 @@
affect the encoding time and resulting filesize.
-7.6.3) Compressing MONSTER.SOU with MP3:
+7.7.3) Compressing MONSTER.SOU with MP3:
------ ---------------------------------
You need LAME, and our compress_scumm_sou util from the scummvm-tools package
to perform this task, and ScummVM must be compiled with MAD support.
@@ -877,7 +894,7 @@
to your game directory. You can safely remove the monster.sou file.
-7.6.4) Compressing MONSTER.SOU with Ogg Vorbis:
+7.7.4) Compressing MONSTER.SOU with Ogg Vorbis:
------ ----------------------------------------
As above, but ScummVM must be compiled with OGG support. Run:
@@ -888,7 +905,7 @@
than MP3, so have a good book handy.
-7.6.5) Compressing MONSTER.SOU with Flac:
+7.7.5) Compressing MONSTER.SOU with Flac:
------ ----------------------------------------
As above, but ScummVM must be compiled with Flac support. Run:
@@ -902,7 +919,7 @@
to read the encoder documentation before you use other values.
-7.6.6) Compressing sfx/speech in Simon the Sorcerer 1 and 2
+7.7.6) Compressing sfx/speech in Simon the Sorcerer 1 and 2
------ ----------------------------------------------------
Use our compress_simon util from the scummvm-tools package to perform this
task. You can choose between multiple target formats, but note that you can
@@ -929,7 +946,7 @@
Eventually you will have a much smaller *.mp3, *.ogg or *.fla file, copy this
file to your game dir. You can safely remove the old file.
-7.6.7) Compressing speech/music in Broken Sword 1
+7.7.7) Compressing speech/music in Broken Sword 1
------ ------------------------------------------
The compress_sword1 tool from the scummvm-tools package can encode music and
speech to MP3 as well as Ogg Vorbis.
@@ -945,7 +962,7 @@
Use "compress_sword1 --help" to get a full list of the options.
-7.6.8) Compressing speech/music in Broken Sword 2
+7.7.8) Compressing speech/music in Broken Sword 2
------ ------------------------------------------
Use our compress_sword2 util from the scummvm-tools package to perform this
task. You can choose between multiple target formats, but note that you can
@@ -970,7 +987,7 @@
nor will it work with the speech files from Broken Sword 1.
-7.7) Output sample rate:
+7.8) Output sample rate:
---- -------------------
The output sample rate tells ScummVM how many sound samples to play per channel
per second. There is much that could be said on this subject, but most of it
@@ -1087,6 +1104,8 @@
music_volume number The music volume setting (0-255)
multi_midi bool If true, enable combination Adlib and native
MIDI.
+ soundfont string The SoundFont to use for MIDI playback. (Only
+ supported by some MIDI drivers.)
native_mt32 bool If true, disable GM emulation and assume that
there is a true Roland MT-32 available.
sfx_volume number The sfx volume setting (0-255)
@@ -1150,20 +1169,20 @@
Microsoft Visual C++ 6.0:
* Open the workspace, scummwm.dsw
* Enter the path to the needed libraries and includes in
- Tools|Options|Directories
+ Tools|Options|Directories
* Now it should compile successfully.
Microsoft Visual C++ 7.0:
* Open the solution file scummwm.sln
* Enter the path to the needed libraries and includes in
- Tools|Options|Projects|VC++ Directories
+ Tools|Options|Projects|VC++ Directories
* Now it should compile successfully.
Windows Mobile with Microsoft eMbedded Visual C++ 3 or 4 :
* Download SDL with additional Windows Mobile tweaks:
http://arisme.free.fr/ports/SDL.php
* Download additional third party libraries:
- http://arisme.free.fr/ports
+ http://arisme.free.fr/ports
* Modify your include and library paths accordingly in EVC3/EVC4.
* Open the ScummVM project dists\msevc4\PocketSCUMM.vcw
* Modify the libraries and config parameters if necessary.
Index: TODO
===================================================================
RCS file: /cvsroot/scummvm/scummvm/TODO,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- TODO 10 Apr 2005 09:45:05 -0000 1.263
+++ TODO 10 Apr 2005 14:33:42 -0000 1.264
@@ -183,6 +183,8 @@
Problem: It's not fully clear to me how to "best" deal with global vs. local
settings here...
* Maybe add the ScummVM logo (+typeface?) to the about dialog
+* Unify DirBrowserDialog and FileBrowserDialog.
+* MacOS X version of FileBrowserDialog, since there is one of DirBrowserDialog.
Launcher
========
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure 5 Apr 2005 15:07:37 -0000 1.115
+++ configure 10 Apr 2005 14:33:42 -0000 1.116
@@ -20,6 +20,7 @@
_alsa=auto
_zlib=auto
_mpeg2=auto
+_fluidsynth=auto
_mt32emu=yes
# default option behaviour yes/no
_build_scumm=yes
@@ -294,6 +295,9 @@
--with-mpeg2-prefix=DIR Prefix where libmpeg2 is installed (optional)
--disable-mpeg2 disable mpeg2 codec for cutscenes [autodetect]
+ --with-fluidsynth-prefix=DIR Prefix where libfluidsynth is installed (optional)
+ --disable-fluidsynth disable fluidsynth MIDI driver [autodetect]
+
--with-sdl-prefix=DIR Prefix where the sdl-config script is installed (optional)
--with-nasm-prefix=DIR Prefix where nasm executable is installed (optional)
@@ -338,9 +342,15 @@
--enable-nasm) _nasm=yes ;;
--disable-nasm) _nasm=no ;;
--disable-mpeg2) _mpeg2=no ;;
+ --disable-fluidsynth) _fluidsynth=no ;;
--enable-plugins) _build_plugins=yes ;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
+ --with-fluidsynth-prefix=*)
+ _prefix=`echo $ac_option | cut -d '=' -f 2`
+ FLUIDSYNTH_CFLAGS="-I$_prefix/include"
+ FLUIDSYNTH_LIBS="-L$_prefix/lib"
+ ;;
--with-mpeg2-prefix=*)
_prefix=`echo $ac_option | cut -d '=' -f 2`
MPEG2_CFLAGS="-I$_prefix/include"
@@ -991,6 +1001,28 @@
rm -f $TMPC $TMPO$EXEEXT
#
+# Check for libfluidsynth
+#
+echocheck "libfluidsynth"
+if test "$_fluidsynth" = auto ; then
+ _fluidsynth=no
+ cat > $TMPC << EOF
+#include <fluidsynth.h>
+int main(void) { return 0; }
+EOF
+ cc_check $LDFLAGS $CXXFLAGS $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS -lfluidsynth && _fluidsynth=yes
+fi
+if test "$_fluidsynth" = yes ; then
+ _def_fluidsynth='#define USE_FLUIDSYNTH'
+ LIBS="$LIBS $FLUIDSYNTH_LIBS -lfluidsynth"
+ INCLUDE="$INCLUDES $FLUIDSYNTH_CFLAGS"
+else
+ _def_fluidsynth='#undef USE_FLUIDSYNTH'
+fi
+echo "$_fluidsynth"
+rm -f $TMPC $TMPO$EXEEXT
+
+#
# Check for nasm
#
if test "$_have_x86" = yes ; then
@@ -1126,6 +1158,7 @@
$_def_alsa
$_def_zlib
$_def_mpeg2
+$_def_fluidsynth
$_def_mt32emu
/* Whether we should use i386 assembly routines */
More information about the Scummvm-git-logs
mailing list