From 2d2b3d0ed21ec800a8a87f9fde8d27206a0dc9c7 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 14 Apr 2007 12:03:46 +0000 Subject: Renamed AGOSEngine::midi to AGOSEngine::_midi svn-id: r26468 --- engines/agos/agos.cpp | 24 ++++++++++++------------ engines/agos/agos.h | 2 +- engines/agos/debugger.cpp | 6 +++--- engines/agos/input.cpp | 8 ++++---- engines/agos/res_snd.cpp | 36 ++++++++++++++++++------------------ engines/agos/script_e1.cpp | 4 ++-- engines/agos/script_s1.cpp | 2 +- engines/agos/script_s2.cpp | 4 ++-- engines/agos/vga_s2.cpp | 16 ++++++++-------- 9 files changed, 51 insertions(+), 51 deletions(-) (limited to 'engines') diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index e68f810ac1..90e7e8aa78 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -73,7 +73,7 @@ static const GameSpecificSettings puzzlepack_settings = { #endif AGOSEngine::AGOSEngine(OSystem *syst) - : Engine(syst), midi() { + : Engine(syst) { _vcPtr = 0; _vc_get_out_of_code = 0; _gameOffsetsPtr = 0; @@ -517,16 +517,16 @@ int AGOSEngine::init() { } } - 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 @@ int AGOSEngine::init() { 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 @@ void AGOSEngine::setupGame() { AGOSEngine::~AGOSEngine() { delete _gameFile; - midi.close(); + _midi.close(); free(_itemHeapPtr - _itemHeapCurPos); free(_tablesHeapPtr - _tablesHeapCurPos); @@ -819,14 +819,14 @@ void AGOSEngine::pause() { 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 @@ int AGOSEngine::go() { void AGOSEngine::shutdown() { delete _gameFile; - midi.close(); + _midi.close(); free(_stringTabPtr); free(_itemArrayPtr); diff --git a/engines/agos/agos.h b/engines/agos/agos.h index b2a4f1b8f1..6479ac2ae9 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -488,7 +488,7 @@ protected: byte _lettersToPrintBuf[80]; - MidiPlayer midi; + MidiPlayer _midi; bool _native_mt32; int _vgaTickCounter; diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index c27a5abd80..336039a726 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -48,12 +48,12 @@ Debugger::Debugger(AGOSEngine *vm) 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 @@ bool Debugger::Cmd_PlayMusic(int argc, const char **argv) { 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 diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 6f4a895a9e..f84083b7bc 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -540,19 +540,19 @@ bool AGOSEngine::processSpecialKeys() { _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; diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 614608a54f..4f49ad6121 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -163,22 +163,22 @@ void AGOSEngine::loadMusic(uint music) { 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 @@ void AGOSEngine::loadMusic(uint music) { _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 @@ void AGOSEngine::loadMusic(uint music) { 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 @@ void AGOSEngine::loadMusic(uint music) { } 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 @@ void AGOSEngine::loadMusic(uint music) { 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 @@ void AGOSEngine::playSting(uint a) { 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] = { diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index 7dcf8e455d..3cbc168c80 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -623,10 +623,10 @@ void AGOSEngine::oe1_playTune() { if (getPlatform() == Common::kPlatformAmiga) _mixer->stopHandle(_modHandle); else - midi.stop(); + _midi.stop(); } else { loadMusic(music); - midi.startTrack(track); + _midi.startTrack(track); } } } diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 3a59cff178..12184fdfb4 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -100,7 +100,7 @@ void AGOSEngine::os1_playTune() { if (music != _lastMusicPlayed) { _lastMusicPlayed = music; loadMusic(music); - midi.startTrack(track); + _midi.startTrack(track); } } diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 3605da6895..ddcc1132eb 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -124,11 +124,11 @@ void AGOSEngine::os2_playTune() { // 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() { diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 7befcf23c0..d251604181 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -145,8 +145,8 @@ void AGOSEngine::vc69_playSeq() { // 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 @@ void AGOSEngine::vc70_joinSeq() { // 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 @@ void AGOSEngine::vc71_ifSeqWaiting() { // 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 @@ void AGOSEngine::vc72_segue() { 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); } } -- cgit v1.2.3