thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Moved the specific interrupt frequency of 80 Hz out of class Infogrames into the GobEngine's Infogrames instances

Browse source 
- Changed the 80 Hz to 75 Hz, which is more true to the original

svn-id: r25389
This commit is contained in:
Sven Hesse 2007-02-04 15:59:05 +00:00
parent 890ee97285
commit 0ed752aa6e
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/gob/inter_v2.cpp
View file

@ -2314,7 +2314,7 @@ void Inter_v2::o2_playInfogrames(int16 &extraData, int32 *retVarPtr, Goblin::Gob
_vm->_mixer->stopHandle(_vm->_game->_infHandle); _vm->_mixer->stopHandle(_vm->_game->_infHandle);
_vm->_game->_infogrames = _vm->_game->_infogrames =
new Audio::Infogrames(*_vm->_game->_infIns, true, new Audio::Infogrames(*_vm->_game->_infIns, true,
_vm->_mixer->getOutputRate()); _vm->_mixer->getOutputRate(), _vm->_mixer->getOutputRate() / 75);
if (!_vm->_game->_infogrames->load(fileName)) { if (!_vm->_game->_infogrames->load(fileName)) {
warning("Couldn't load infogrames music"); warning("Couldn't load infogrames music");
delete _vm->_game->_infogrames; delete _vm->_game->_infogrames;

4
sound/mods/infogrames.cpp
View file

@ -120,8 +120,8 @@ const uint16 Infogrames::periods[] =
0x0A0A, 0x0A0A, 0x0A0A, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0A0A, 0x0A0A, 0x0A0A, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202,
0x0202, 0x0202, 0x0202, 0x0202, 0x4040, 0x4040, 0x2000}; 0x0202, 0x0202, 0x0202, 0x0202, 0x4040, 0x4040, 0x2000};
Infogrames::Infogrames(Instruments &ins, bool stereo, int rate) : Infogrames::Infogrames(Instruments &ins, bool stereo, int rate,
Paula(stereo, rate, rate/80) { int interruptFreq) : Paula(stereo, rate, interruptFreq) {
_instruments = &ins; _instruments = &ins;
_data = 0; _data = 0;
_repCount = -1; _repCount = -1;

3
sound/mods/infogrames.h
View file

@ -70,7 +70,8 @@ public:
friend class Infogrames; 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(); ~Infogrames();
Instruments *getInstruments(void) const { return _instruments; } Instruments *getInstruments(void) const { return _instruments; }