diff options
| author | Sven Hesse | 2007-02-04 15:59:05 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-02-04 15:59:05 +0000 |
| commit | 0ed752aa6ee77a6a5262c366c41e1d08ba3ab44c (patch) | |
| tree | cddf5d607ba2ba51a35d4bae47c6c6d9a4ba9bda | |
| parent | 890ee9728524e30719297624261f749d8138b65d (diff) | |
| download | scummvm-rg350-0ed752aa6ee77a6a5262c366c41e1d08ba3ab44c.tar.gz scummvm-rg350-0ed752aa6ee77a6a5262c366c41e1d08ba3ab44c.tar.bz2 scummvm-rg350-0ed752aa6ee77a6a5262c366c41e1d08ba3ab44c.zip | |
- Moved the specific interrupt frequency of 80 Hz out of class Infogrames into the GobEngine's Infogrames instances
- Changed the 80 Hz to 75 Hz, which is more true to the original
svn-id: r25389
| -rw-r--r-- | engines/gob/inter_v2.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/infogrames.cpp | 4 | ||||
| -rw-r--r-- | sound/mods/infogrames.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 22a3ca6d97..b0efea4ea3 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -2314,7 +2314,7 @@ void Inter_v2::o2_playInfogrames(int16 &extraData, int32 *retVarPtr, Goblin::Gob _vm->_mixer->stopHandle(_vm->_game->_infHandle); _vm->_game->_infogrames = new Audio::Infogrames(*_vm->_game->_infIns, true, - _vm->_mixer->getOutputRate()); + _vm->_mixer->getOutputRate(), _vm->_mixer->getOutputRate() / 75); if (!_vm->_game->_infogrames->load(fileName)) { warning("Couldn't load infogrames music"); delete _vm->_game->_infogrames; diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp index a1eeddf22d..a901e48419 100644 --- a/sound/mods/infogrames.cpp +++ b/sound/mods/infogrames.cpp @@ -120,8 +120,8 @@ const uint16 Infogrames::periods[] = 0x0A0A, 0x0A0A, 0x0A0A, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x4040, 0x4040, 0x2000}; -Infogrames::Infogrames(Instruments &ins, bool stereo, int rate) : - Paula(stereo, rate, rate/80) { +Infogrames::Infogrames(Instruments &ins, bool stereo, int rate, + int interruptFreq) : Paula(stereo, rate, interruptFreq) { _instruments = &ins; _data = 0; _repCount = -1; diff --git a/sound/mods/infogrames.h b/sound/mods/infogrames.h index 78bc9efd82..c40f107947 100644 --- a/sound/mods/infogrames.h +++ b/sound/mods/infogrames.h @@ -70,7 +70,8 @@ public: friend class Infogrames; }; - Infogrames(Instruments &ins, bool stereo = false, int rate = 44100); + Infogrames(Instruments &ins, bool stereo = false, int rate = 44100, + int interruptFreq = 0); ~Infogrames(); Instruments *getInstruments(void) const { return _instruments; } |