From a777b3e64f6b29f313b8a66a98c58dac62f70c78 Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Sat, 18 Aug 2007 15:54:29 +0000
Subject: Changed Apple IIGS sample playing frequency multiplier from 1076.0 to
 C6 (i.e. about 1046.5). Commented out a warning that comes too often.

svn-id: r28657
---
 engines/agi/sound.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines/agi/sound.cpp')

diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 8527d11202..3bff875cc4 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -639,7 +639,7 @@ void SoundMgr::playSound() {
 		if (playingSound != -1) {
 			if (_vm->_game.sounds[playingSound]->type() == AGI_SOUND_MIDI) {
 				/* play_midi_sound (); */
-				warning("playSound: Trying to play an Apple IIGS MIDI sound. Not yet implemented!");
+				//warning("playSound: Trying to play an Apple IIGS MIDI sound. Not yet implemented!");
 				playing = 0;
 			} else if (_vm->_game.sounds[playingSound]->type() == AGI_SOUND_SAMPLE) {
 				//debugC(3, kDebugLevelSound, "playSound: Trying to play an Apple IIGS sample");
@@ -687,8 +687,11 @@ uint32 SoundMgr::mixSound(void) {
 		//double hertz = 8.175798915644 * pow(SEMITONE, fracToDouble(chn.note));
 		// double step = getRate() / hertz;
 		// chn.posAdd = doubleToFrac(step);
-
-		double hertz = 1076.0 * pow(SEMITONE, fracToDouble(chn.note));
+		
+		// Frequency multiplier was 1076.0 based on tests made with MESS 0.117.
+		// Tests made with KEGS32 averaged the multiplier to around 1045.
+		// So this is a guess but maybe it's 1046.5... i.e. C6's frequency?
+		double hertz = C6_FREQ * pow(SEMITONE, fracToDouble(chn.note));
 		chn.posAdd = doubleToFrac(hertz / getRate());
 		chn.vol = doubleToFrac(fracToDouble(chn.envVol) * fracToDouble(chn.chanVol) / 127.0);
 		double tempVol = fracToDouble(chn.vol)/127.0;
-- 
cgit v1.2.3