[Scummvm-git-logs] scummvm master -> 21450facee606e8303fb06b94b9c2a3306254442

digitall dgturner at iee.org
Tue May 7 02:41:00 CEST 2019


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:
21450facee MT32: Fix GCC Compiler Warning regarding memset usage


Commit: 21450facee606e8303fb06b94b9c2a3306254442
    https://github.com/scummvm/scummvm/commit/21450facee606e8303fb06b94b9c2a3306254442
Author: D G Turner (digitall at scummvm.org)
Date: 2019-05-07T01:39:12+01:00

Commit Message:
MT32: Fix GCC Compiler Warning regarding memset usage

Changed paths:
    audio/softsynth/mt32/MidiEventQueue.h
    audio/softsynth/mt32/Synth.cpp


diff --git a/audio/softsynth/mt32/MidiEventQueue.h b/audio/softsynth/mt32/MidiEventQueue.h
index c5174d6..32a0bbe 100644
--- a/audio/softsynth/mt32/MidiEventQueue.h
+++ b/audio/softsynth/mt32/MidiEventQueue.h
@@ -32,6 +32,7 @@ struct MidiEvent {
 	Bit32u sysexLength;
 	Bit32u timestamp;
 
+	MidiEvent();
 	~MidiEvent();
 	void setShortMessage(Bit32u shortMessageData, Bit32u timestamp);
 	void setSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);
diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index 62810ba..a0d6631 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -1753,6 +1753,13 @@ Bit32s Synth::getMasterTunePitchDelta() const {
 	return extensions.masterTunePitchDelta;
 }
 
+MidiEvent::MidiEvent() {
+	shortMessageData = 0;
+	sysexData = NULL;
+	sysexLength = 0;
+	timestamp = 0;
+}
+
 MidiEvent::~MidiEvent() {
 	if (sysexData != NULL) {
 		delete[] sysexData;
@@ -1782,7 +1789,6 @@ void MidiEvent::setSysex(const Bit8u *useSysexData, Bit32u useSysexLength, Bit32
 }
 
 MidiEventQueue::MidiEventQueue(Bit32u useRingBufferSize) : ringBuffer(new MidiEvent[useRingBufferSize]), ringBufferMask(useRingBufferSize - 1) {
-	memset(ringBuffer, 0, useRingBufferSize * sizeof(MidiEvent));
 	reset();
 }
 





More information about the Scummvm-git-logs mailing list