[Scummvm-cvs-logs] SF.net SVN: scummvm: [26468] scummvm/trunk/engines/agos
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Apr 14 14:03:47 CEST 2007
Revision: 26468
http://scummvm.svn.sourceforge.net/scummvm/?rev=26468&view=rev
Author: fingolfin
Date: 2007-04-14 05:03:46 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
Renamed AGOSEngine::midi to AGOSEngine::_midi
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/debugger.cpp
scummvm/trunk/engines/agos/input.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/script_e1.cpp
scummvm/trunk/engines/agos/script_s1.cpp
scummvm/trunk/engines/agos/script_s2.cpp
scummvm/trunk/engines/agos/vga_s2.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/agos.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -73,7 +73,7 @@
#endif
AGOSEngine::AGOSEngine(OSystem *syst)
- : Engine(syst), midi() {
+ : Engine(syst) {
_vcPtr = 0;
_vc_get_out_of_code = 0;
_gameOffsetsPtr = 0;
@@ -517,16 +517,16 @@
}
}
- midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_native_mt32);
+ _midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_native_mt32);
- midi.setDriver(driver);
- int ret = midi.open();
+ _midi.setDriver(driver);
+ int ret = _midi.open();
if (ret)
- warning("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
- midi.setVolume(ConfMan.getInt("music_volume"));
+ warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret));
+ _midi.setVolume(ConfMan.getInt("music_volume"));
if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
- midi.pause(_musicPaused ^= 1);
+ _midi.pause(_musicPaused ^= 1);
// allocate buffers
_backGroundBuf = (byte *)calloc(_screenWidth * _screenHeight, 1);
@@ -544,7 +544,7 @@
if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) {
if (getGameId() == GID_SIMON1DOS)
- midi._enable_sfx ^= 1;
+ _midi._enable_sfx ^= 1;
else
_sound->effectsPause(_effectsPaused ^= 1);
}
@@ -776,7 +776,7 @@
AGOSEngine::~AGOSEngine() {
delete _gameFile;
- midi.close();
+ _midi.close();
free(_itemHeapPtr - _itemHeapCurPos);
free(_tablesHeapPtr - _tablesHeapCurPos);
@@ -819,14 +819,14 @@
bool ambient_status = _ambientPaused;
bool music_status = _musicPaused;
- midi.pause(true);
+ _midi.pause(true);
_sound->ambientPause(true);
while (_pause) {
delay(1);
if (_keyPressed == 'p')
_pause = 0;
}
- midi.pause(music_status);
+ _midi.pause(music_status);
_sound->ambientPause(ambient_status);
}
@@ -896,7 +896,7 @@
void AGOSEngine::shutdown() {
delete _gameFile;
- midi.close();
+ _midi.close();
free(_stringTabPtr);
free(_itemArrayPtr);
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/agos.h 2007-04-14 12:03:46 UTC (rev 26468)
@@ -488,7 +488,7 @@
byte _lettersToPrintBuf[80];
- MidiPlayer midi;
+ MidiPlayer _midi;
bool _native_mt32;
int _vgaTickCounter;
Modified: scummvm/trunk/engines/agos/debugger.cpp
===================================================================
--- scummvm/trunk/engines/agos/debugger.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/debugger.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -48,12 +48,12 @@
void Debugger::preEnter() {
- //_vm->midi.pause(1);
+ //_vm->_midi.pause(1);
}
void Debugger::postEnter() {
- //_vm->midi.pause(0);
+ //_vm->_midi.pause(0);
}
@@ -85,7 +85,7 @@
if (music <= range) {
_vm->loadMusic(music);
if (_vm->getGameType() == GType_SIMON2)
- _vm->midi.startTrack(0);
+ _vm->_midi.startTrack(0);
} else
DebugPrintf("Music out of range (0 - %d)\n", range);
} else
Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/input.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -540,19 +540,19 @@
_speech ^= 1;
}
case '+':
- midi.setVolume(midi.getVolume() + 16);
+ _midi.setVolume(_midi.getVolume() + 16);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) + 16);
break;
case '-':
- midi.setVolume(midi.getVolume() - 16);
+ _midi.setVolume(_midi.getVolume() - 16);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) - 16);
break;
case 'm':
- midi.pause(_musicPaused ^= 1);
+ _midi.pause(_musicPaused ^= 1);
break;
case 's':
if (getGameId() == GID_SIMON1DOS)
- midi._enable_sfx ^= 1;
+ _midi._enable_sfx ^= 1;
else
_sound->effectsPause(_effectsPaused ^= 1);
break;
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -163,22 +163,22 @@
char buf[4];
if (getGameType() == GType_SIMON2) {
- midi.stop();
+ _midi.stop();
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);
_gameFile->read(buf, 4);
if (!memcmp(buf, "FORM", 4)) {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);
- midi.loadXMIDI(_gameFile);
+ _midi.loadXMIDI(_gameFile);
} else {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);
- midi.loadMultipleSMF(_gameFile);
+ _midi.loadMultipleSMF(_gameFile);
}
_lastMusicPlayed = music;
_nextMusicToPlay = -1;
} else if (getGameType() == GType_SIMON1) {
- midi.stop();
- midi.setLoop(true); // Must do this BEFORE loading music. (GMF may have its own override.)
+ _midi.stop();
+ _midi.setLoop(true); // Must do this BEFORE loading music. (GMF may have its own override.)
// Support for compressed music from the ScummVM Music Enhancement Project
AudioCD.stop();
@@ -201,13 +201,13 @@
_gameFile->read(buf, 4);
if (!memcmp(buf, "GMF\x1", 4)) {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
- midi.loadSMF(_gameFile, music);
+ _midi.loadSMF(_gameFile, music);
} else {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
- midi.loadMultipleSMF(_gameFile);
+ _midi.loadMultipleSMF(_gameFile);
}
- midi.startTrack(0);
+ _midi.startTrack(0);
} else {
char filename[15];
File f;
@@ -217,11 +217,11 @@
error("loadMusic: Can't load music from '%s'", filename);
if (getFeatures() & GF_DEMO)
- midi.loadS1D(&f);
+ _midi.loadS1D(&f);
else
- midi.loadSMF(&f, music);
+ _midi.loadSMF(&f, music);
- midi.startTrack(0);
+ _midi.startTrack(0);
}
} else {
if (getPlatform() == Common::kPlatformAmiga) {
@@ -229,8 +229,8 @@
} else if (getPlatform() == Common::kPlatformAtariST) {
// TODO: Add support for music formats used
} else {
- midi.stop();
- midi.setLoop(true); // Must do this BEFORE loading music.
+ _midi.stop();
+ _midi.setLoop(true); // Must do this BEFORE loading music.
char filename[15];
File f;
@@ -239,14 +239,14 @@
if (f.isOpen() == false)
error("loadMusic: Can't load music from '%s'", filename);
- midi.loadS1D(&f);
- midi.startTrack(0);
+ _midi.loadS1D(&f);
+ _midi.startTrack(0);
}
}
}
void AGOSEngine::playSting(uint a) {
- if (!midi._enable_sfx)
+ if (!_midi._enable_sfx)
return;
char filename[15];
@@ -265,8 +265,8 @@
error("playSting: Can't read sting %d offset", a);
mus_file.seek(mus_offset, SEEK_SET);
- midi.loadSMF(&mus_file, a, true);
- midi.startTrack(0);
+ _midi.loadSMF(&mus_file, a, true);
+ _midi.startTrack(0);
}
static const byte elvira1_soundTable[100] = {
Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/script_e1.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -623,10 +623,10 @@
if (getPlatform() == Common::kPlatformAmiga)
_mixer->stopHandle(_modHandle);
else
- midi.stop();
+ _midi.stop();
} else {
loadMusic(music);
- midi.startTrack(track);
+ _midi.startTrack(track);
}
}
}
Modified: scummvm/trunk/engines/agos/script_s1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_s1.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/script_s1.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -100,7 +100,7 @@
if (music != _lastMusicPlayed) {
_lastMusicPlayed = music;
loadMusic(music);
- midi.startTrack(track);
+ _midi.startTrack(track);
}
}
Modified: scummvm/trunk/engines/agos/script_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_s2.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/script_s2.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -124,11 +124,11 @@
// effectively preloaded so there's no latency when
// starting playback).
- midi.setLoop(loop != 0);
+ _midi.setLoop(loop != 0);
if (_lastMusicPlayed != music)
_nextMusicToPlay = music;
else
- midi.startTrack(track);
+ _midi.startTrack(track);
}
void AGOSEngine::os2_screenTextPObj() {
Modified: scummvm/trunk/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s2.cpp 2007-04-14 11:00:29 UTC (rev 26467)
+++ scummvm/trunk/engines/agos/vga_s2.cpp 2007-04-14 12:03:46 UTC (rev 26468)
@@ -145,8 +145,8 @@
// specifying a non-valid track number (999 or -1)
// as a means of stopping what music is currently
// playing.
- midi.setLoop(loop != 0);
- midi.startTrack(track);
+ _midi.setLoop(loop != 0);
+ _midi.startTrack(track);
}
void AGOSEngine::vc70_joinSeq() {
@@ -160,9 +160,9 @@
// track and, if not, whether to switch to
// a different track upon completion.
if (track != 0xFFFF && track != 999)
- midi.queueTrack(track, loop != 0);
+ _midi.queueTrack(track, loop != 0);
else
- midi.setLoop(loop != 0);
+ _midi.setLoop(loop != 0);
}
void AGOSEngine::vc71_ifSeqWaiting() {
@@ -170,7 +170,7 @@
// This command skips the next instruction
// unless (1) there is a track playing, AND
// (2) there is a track queued to play after it.
- if (!midi.isPlaying(true))
+ if (!_midi.isPlaying(true))
vcSkipNextInstruction();
}
@@ -192,10 +192,10 @@
int16 loop = vcReadNextWord();
if (track == -1 || track == 999) {
- midi.stop();
+ _midi.stop();
} else {
- midi.setLoop(loop != 0);
- midi.startTrack(track);
+ _midi.setLoop(loop != 0);
+ _midi.startTrack(track);
}
}
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