[Scummvm-cvs-logs] SF.net SVN: scummvm: [25389] scummvm/trunk

[drmccoy at users.sourceforge.net]

Revision: 25389
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25389&view=rev
Author:   drmccoy
Date:     2007-02-04 07:59:05 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
- 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

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v2.cpp
    scummvm/trunk/sound/mods/infogrames.cpp
    scummvm/trunk/sound/mods/infogrames.h

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2007-02-04 15:48:51 UTC (rev 25388)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2007-02-04 15:59:05 UTC (rev 25389)
@@ -2314,7 +2314,7 @@
 		_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;

Modified: scummvm/trunk/sound/mods/infogrames.cpp
===================================================================
--- scummvm/trunk/sound/mods/infogrames.cpp	2007-02-04 15:48:51 UTC (rev 25388)
+++ scummvm/trunk/sound/mods/infogrames.cpp	2007-02-04 15:59:05 UTC (rev 25389)
@@ -120,8 +120,8 @@
 	 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;

Modified: scummvm/trunk/sound/mods/infogrames.h
===================================================================
--- scummvm/trunk/sound/mods/infogrames.h	2007-02-04 15:48:51 UTC (rev 25388)
+++ scummvm/trunk/sound/mods/infogrames.h	2007-02-04 15:59:05 UTC (rev 25389)
@@ -70,7 +70,8 @@
 		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; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.