[Scummvm-cvs-logs] CVS: scummvm README,1.288,1.289 configure,1.103,1.104 scummvm.6,1.19,1.20
Eugene Sandulenko
sev at users.sourceforge.net
Thu Oct 21 15:44:06 CEST 2004
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22342
Modified Files:
README configure scummvm.6
Log Message:
Patch #1048326 Better MT-32 support
Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/README,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- README 14 Oct 2004 10:33:48 -0000 1.288
+++ README 21 Oct 2004 22:37:30 -0000 1.289
@@ -30,11 +30,12 @@
* 6.1 Autosaves
7.0) Music and Sound
* 7.1 Adlib emulation
- * 7.2 MIDI emulation
- * 7.3 Native MIDI support
- * 7.4 UNIX native & ALSA sequencer support
- * 7.5 Using compressed audiofiles (MP3, Ogg Vorbis, Flac)
- * 7.6 Output sample rate
+ * 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
8.0) Configuration Files
9.0) Compiling
X.X) Credits
@@ -659,6 +660,7 @@
choices of output, depending on your operating system and configuration.
adlib - Uses internal Adlib Emulation (default)
+ mt32 - Uses internal MT-32 Emulation
pcjr - Uses internal PCjr Emulation
pcspk - Uses internal PC Speaker Emulation
towns - Uses FM-TOWNS YM2612 Emulation
@@ -682,25 +684,38 @@
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:
+---- -----------------------------------
+Some games which contain MIDI music data also have improved tracks designed
+for MT-32 sound module. ScummVM can now emulate this card, however you should
+provide original MT-32 ROMs to make it work. Put the roms in game directory or
+directory specified by extrapath.
-7.2) Playing sound with MIDI emulation:
+You don't need to specify --native-mt32 with this driver, as it automatically
+gets turned on.
+
+NOTE: You need to have enough processor power to use this emulator as it uses
+heavy floating-point computations.
+
+
+7.3) 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 emulation using the -eadlib option. However, if you are capable
-of using native MIDI, we recommend using one of the MIDI modes below for best
-sound.
+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.
-7.3) Playing sound with Native MIDI:
+7.4) 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.4.0) Playing sound with Sequencer MIDI: [UNIX ONLY]
+7.5.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
@@ -713,7 +728,7 @@
sequencer support does not work, you can always fall back on Adlib emulation.
-7.4.1) Playing sound with ALSA sequencer: [UNIX ONLY]
+7.5.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
@@ -762,7 +777,7 @@
Once either TiMidity or FluidSynth are running, use the 'aconnect -o -l'
command as described earlier in this section.
-7.5.0) Using MP3 files for CD audio:
+7.6.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
@@ -773,7 +788,7 @@
lame -t -q 0 -b 96 track1.wav track1.mp3
-7.5.1) Using Ogg Vorbis files for CD audio:
+7.6.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
@@ -784,7 +799,7 @@
oggenc -q 5 track1.wav
-7.5.2) Using Flac files for CD audio:
+7.6.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
@@ -799,7 +814,7 @@
affect the encoding time and resulting filesize.
-7.5.3) Compressing MONSTER.SOU with MP3:
+7.6.3) Compressing MONSTER.SOU with MP3:
------ ---------------------------------
You need LAME, and our extract util from the scummvm-tools package to perform
this task, and ScummVM must be compiled with MAD support.
@@ -810,7 +825,7 @@
to your game directory. You can safely remove the monster.sou file.
-7.5.4) Compressing MONSTER.SOU with Ogg Vorbis:
+7.6.4) Compressing MONSTER.SOU with Ogg Vorbis:
------ ----------------------------------------
As above, but ScummVM must be compiled with OGG support. Run:
@@ -821,7 +836,7 @@
than MP3, so have a good book handy.
-7.5.5) Compressing MONSTER.SOU with Flac:
+7.6.5) Compressing MONSTER.SOU with Flac:
------ ----------------------------------------
As above, but ScummVM must be compiled with Flac support. Run:
@@ -835,7 +850,7 @@
to read the encoder documentation before you use other values.
-7.5.6) Compressing sfx/speech in Simon the Sorcerer 1 and 2
+7.6.6) Compressing sfx/speech in Simon the Sorcerer 1 and 2
------ ----------------------------------------------------
Use our simon2mp3 util from the scummvm-tools package to perform this task.
You can choose between multiple target formats, but note that you can only use
@@ -861,7 +876,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.5.7) Compressing speech/music in Broken Sword 1
+7.6.7) Compressing speech/music in Broken Sword 1
------ ------------------------------------------
The sword1mp3 tool from the scummvm-tools package can encode music and speech
to MP3 as well as Ogg Vorbis.
@@ -876,7 +891,7 @@
Use "sword1mp3 --help" to get a full list of the options.
-7.5.8) Compressing speech/music in Broken Sword 2
+7.6.8) Compressing speech/music in Broken Sword 2
------ ------------------------------------------
Use our sword2mp3 util from the scummvm-tools package to perform this task.
You can choose between multiple target formats, but note that you can only use
@@ -900,7 +915,7 @@
work with the speech files from Broken Sword 1.
-7.6) Output sample rate:
+7.7) Output sample rate:
---- -------------------
The output sample rate tells ScummVM how many sound samples to play per channel
@@ -1181,9 +1196,12 @@
Special thanks to:
Sander Buskens - For his work on the initial reversing of Monkey2
+ Canadacow - For his MT-32 emulator
Kevin Carnes - For Scumm16, the basis of ScummVM older gfx codec
+ Jezar - For his freeverb filter implementation
Jim Leiterman - Various info on his FM-TOWNS/Marty SCUMM ports
Jimmi Thogersen - For ScummRev, and much obscure code/documentation
+ Tristan - For his Linux port of MT-32 emulator
Tony Warriner and everyone at Revolution Software Ltd. for sharing
with us the source of some of their brilliant games, allowing us to
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- configure 17 Oct 2004 17:57:33 -0000 1.103
+++ configure 21 Oct 2004 22:37:30 -0000 1.104
@@ -51,6 +51,7 @@
NASMFLAGS=""
NASM=""
_prefix=/usr/local
+_have_x86=""
_srcdir=`dirname $0`
@@ -660,6 +661,26 @@
rm -f tmp_endianness_check$EXEEXT tmp_endianness_check.cpp
#
+ # Check whether we can use x86 asm routines
+ #
+ echo_n "Running on x86... "
+ case $_host_cpu in
+ i386|i486|i586|i686)
+ _have_x86=yes
+ ;;
+ *)
+ _have_x86=no
+ ;;
+ esac
+
+ if test "$_have_x86" = yes ; then
+ _def_x86='#define HAVE_X86'
+ else
+ _def_x86='#undef HAVE_X86'
+ fi
+ echo "$_have_x86"
+
+ #
# Check whether memory alignment is required
#
echo_n "Alignment required... "
@@ -1019,6 +1040,7 @@
$_def_endianness
$_def_align
+$_def_x86
$_def_linupy
Index: scummvm.6
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.6,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scummvm.6 10 Aug 2004 23:20:28 -0000 1.19
+++ scummvm.6 21 Oct 2004 22:37:30 -0000 1.20
@@ -62,6 +62,8 @@
.br
\fBadlib\fP Uses internal Adlib Emulation (default)
.br
+\fBmt32\fP Uses internal MT-32 Emulation
+.br
\fBwindows\fP Windows MIDI. Uses built-in sequencer.
.br
\fBseq\fP Uses /dev/sequencer for MIDI, *nix users.
More information about the Scummvm-git-logs
mailing list