[Scummvm-cvs-logs] scummvm master -> 76f21a210169579de6dcb55ac62e7072e6a73aad

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
76f21a2101 AUDIO: Miles Audio AdLib: set default volume 0x7F


Commit: 76f21a210169579de6dcb55ac62e7072e6a73aad
    https://github.com/scummvm/scummvm/commit/76f21a210169579de6dcb55ac62e7072e6a73aad
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-07-05T21:25:22+02:00

Commit Message:
AUDIO: Miles Audio AdLib: set default volume 0x7F

set default volume of every midi channel to 0x7F right on startup
fixes Amazon Guardians of Eden logo jingle music
those values were actually sent to the driver right on startup
default value for panning was 0x40, this was adjusted as well

Changed paths:
    audio/miles_adlib.cpp



diff --git a/audio/miles_adlib.cpp b/audio/miles_adlib.cpp
index f033c63..903b0a9 100644
--- a/audio/miles_adlib.cpp
+++ b/audio/miles_adlib.cpp
@@ -350,18 +350,15 @@ void MidiDriver_Miles_AdLib::resetData() {
 	memset(_physicalFmVoices, 0, sizeof(_physicalFmVoices));
 
 	for (byte midiChannel = 0; midiChannel < MILES_MIDI_CHANNEL_COUNT; midiChannel++) {
-		_midiChannels[midiChannel].currentPitchBender = MILES_PITCHBENDER_DEFAULT;
-		_midiChannels[midiChannel].currentPitchRange = 12;
-		// Miles Audio 2: hardcoded pitch range as a global (not channel specific), set to 12
-		// Miles Audio 3: pitch range per MIDI channel
+		// defaults, were sent to driver during driver initialization
+		_midiChannels[midiChannel].currentVolume = 0x7F;
+		_midiChannels[midiChannel].currentPanning = 0x40; // center
 		_midiChannels[midiChannel].currentVolumeExpression = 127;
 
-		// TODO: Miles Audio had currentPanning initialized to 0 inside the driver
-		// Simon the sorcerer 2 as well as Return To Zork don't change this control at all
-		// inside their XMIDI files, so currentPanning set to 0 will create output output on
-		// one speaker only. Maybe there were some default MIDI commands sent to the driver before
-		// playing the music. Needs to get investigated further.
-		_midiChannels[midiChannel].currentPanning = 63; // center
+		// Miles Audio 2: hardcoded pitch range as a global (not channel specific), set to 12
+		// Miles Audio 3: pitch range per MIDI channel
+		_midiChannels[midiChannel].currentPitchBender = MILES_PITCHBENDER_DEFAULT;
+		_midiChannels[midiChannel].currentPitchRange = 12;
 	}
 
 }