[Scummvm-cvs-logs] SF.net SVN: scummvm:[47530] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jan 25 01:13:32 CET 2010
Revision: 47530
http://scummvm.svn.sourceforge.net/scummvm/?rev=47530&view=rev
Author: lordhoto
Date: 2010-01-25 00:13:32 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
Replace some more Adlib uses by AdLib.
Modified Paths:
--------------
scummvm/trunk/dists/scummvm.6
scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/sound/mididrv.h
scummvm/trunk/sound/mixer.h
scummvm/trunk/sound/softsynth/opl/mame.cpp
scummvm/trunk/sound/softsynth/opl/mame.h
Modified: scummvm/trunk/dists/scummvm.6
===================================================================
--- scummvm/trunk/dists/scummvm.6 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/dists/scummvm.6 2010-01-25 00:13:32 UTC (rev 47530)
@@ -31,7 +31,7 @@
to use:
.Bl -tag -width Ds
.It Em adlib
-Adlib emulation (default)
+AdLib emulation (default)
.It Em alsa
Output using ALSA sequencer device
.It Em amidi
@@ -178,7 +178,7 @@
.It Fl -joystick= Ns Ar num
Enable input with joystick (default: 0 = first joystick).
.It Fl -multi-midi
-Enable combination Adlib and native MIDI.
+Enable combination AdLib and native MIDI.
.It Fl -native-mt32
True Roland MT-32 MIDI (disable GM emulation).
.It Fl --render-mode= Ns Ar mode
Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-01-25 00:13:32 UTC (rev 47530)
@@ -208,7 +208,7 @@
break;
// Unhandled SCI commands
case 0x46: // LSL3 - binoculars
- case 0x61: // Iceman (Adlib?)
+ case 0x61: // Iceman (AdLib?)
case 0x73: // Hoyle
case 0xD1: // KQ4, when riding the unicorn
// Obscure SCI commands - ignored
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-01-25 00:13:32 UTC (rev 47530)
@@ -1278,7 +1278,7 @@
return 0;
}
-// Adlib MIDI-SYSEX to set MIDI instruments for small header games.
+// AdLib MIDI-SYSEX to set MIDI instruments for small header games.
static const byte ADLIB_INSTR_MIDI_HACK[95] = {
0x00, 0xf0, 0x14, 0x7d, 0x00, // sysex 00: part on/off
0x00, 0x00, 0x03, // part/channel (offset 5)
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/gui/launcher.cpp 2010-01-25 00:13:32 UTC (rev 47530)
@@ -823,7 +823,7 @@
// default set nothing and use the global ScummVM settings. E.g. the user
// can set here an optional alternate music volume, or for specific games
// a different music driver etc.
- // This is useful because e.g. MonkeyVGA needs Adlib music to have decent
+ // This is useful because e.g. MonkeyVGA needs AdLib music to have decent
// music support etc.
assert(item >= 0);
String gameId(ConfMan.get("gameid", _domains[item]));
Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/sound/mididrv.h 2010-01-25 00:13:32 UTC (rev 47530)
@@ -100,7 +100,7 @@
MDT_NONE = 0,
MDT_PCSPK = 1 << 0, // PC Speaker: Maps to MD_PCSPK and MD_PCJR
MDT_CMS = 1 << 1, // Creative Music System / Gameblaster: Maps to MD_CMS
- MDT_ADLIB = 1 << 2, // Adlib: Maps to MD_ADLIB
+ MDT_ADLIB = 1 << 2, // AdLib: Maps to MD_ADLIB
MDT_TOWNS = 1 << 3, // FM-TOWNS: Maps to MD_TOWNS
MDT_MIDI = 1 << 4, // Real MIDI
MDT_PREFER_MIDI = 1 << 5 // Real MIDI output is preferred
Modified: scummvm/trunk/sound/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/sound/mixer.h 2010-01-25 00:13:32 UTC (rev 47530)
@@ -86,7 +86,7 @@
* Is the mixer ready and setup? This may not be the case on systems which
* don't support digital sound output. In that case, the mixer proc may
* never be called. That in turn can cause breakage in games which try to
- * sync with an audio stream. In particular, the Adlib MIDI emulation...
+ * sync with an audio stream. In particular, the AdLib MIDI emulation...
*
* @return whether the mixer is ready and setup
*
Modified: scummvm/trunk/sound/softsynth/opl/mame.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/mame.cpp 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/sound/softsynth/opl/mame.cpp 2010-01-25 00:13:32 UTC (rev 47530)
@@ -53,7 +53,7 @@
if (_opl)
MAME::OPLDestroy(_opl);
- _opl = MAME::makeAdlibOPL(rate);
+ _opl = MAME::makeAdLibOPL(rate);
return (_opl != 0);
}
@@ -1208,7 +1208,7 @@
return OPL->status >> 7;
}
-FM_OPL *makeAdlibOPL(int rate) {
+FM_OPL *makeAdLibOPL(int rate) {
// We need to emulate one YM3812 chip
int env_bits = FMOPL_ENV_BITS_HQ;
int eg_ent = FMOPL_EG_ENT_HQ;
Modified: scummvm/trunk/sound/softsynth/opl/mame.h
===================================================================
--- scummvm/trunk/sound/softsynth/opl/mame.h 2010-01-24 23:50:22 UTC (rev 47529)
+++ scummvm/trunk/sound/softsynth/opl/mame.h 2010-01-25 00:13:32 UTC (rev 47530)
@@ -173,7 +173,7 @@
void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length);
// Factory method
-FM_OPL *makeAdlibOPL(int rate);
+FM_OPL *makeAdLibOPL(int rate);
// OPL API implementation
class OPL : public ::OPL::OPL {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list