[Scummvm-git-logs] scummvm master -> 1b1fae6494fb64840f83c509d35e9062abecce13

wjp wjp at usecode.org
Sun Feb 26 14:23:57 CET 2017


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:
1b1fae6494 SCI: Clean up unnecessary casts


Commit: 1b1fae6494fb64840f83c509d35e9062abecce13
    https://github.com/scummvm/scummvm/commit/1b1fae6494fb64840f83c509d35e9062abecce13
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-02-26T14:23:36+01:00

Commit Message:
SCI: Clean up unnecessary casts

Changed paths:
    engines/sci/sound/drivers/midi.cpp


diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index badbe66..7b2b102 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -656,13 +656,13 @@ void MidiPlayer_Midi::readMt32DrvData() {
 			f.seek(-2, SEEK_CUR);
 
 		// Send before-SysEx text
-		sendMt32SysEx(0x200000, static_cast<Common::SeekableReadStream *>(&f), 20);
+		sendMt32SysEx(0x200000, &f, 20);
 
 		if (size != 2271) {
 			// Send after-SysEx text (SSCI sends this before every song).
 			// There aren't any SysEx calls in old drivers, so this can
 			// be sent right after the before-SysEx text.
-			sendMt32SysEx(0x200000, static_cast<Common::SeekableReadStream *>(&f), 20);
+			sendMt32SysEx(0x200000, &f, 20);
 		} else {
 			// Skip the after-SysEx text in the newer patch version, we'll send
 			// it after the SysEx messages are sent.
@@ -696,14 +696,14 @@ void MidiPlayer_Midi::readMt32DrvData() {
 			f.skip(2235);	// skip driver code
 
 			// Patches 1-48
-			sendMt32SysEx(0x50000, static_cast<Common::SeekableReadStream *>(&f), 256);
-			sendMt32SysEx(0x50200, static_cast<Common::SeekableReadStream *>(&f), 128);
+			sendMt32SysEx(0x50000, &f, 256);
+			sendMt32SysEx(0x50200, &f, 128);
 
 			setReverb(reverb);
 
 			// Send the after-SysEx text
 			f.seek(0x3d);
-			sendMt32SysEx(0x200000, static_cast<Common::SeekableReadStream *>(&f), 20);
+			sendMt32SysEx(0x200000, &f, 20);
 		} else {
 			byte reverbSysEx[13];
 			// This old driver should have a full reverb SysEx





More information about the Scummvm-git-logs mailing list