thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MT32: Fix GCC Compiler Warning regarding memset usage

Browse source
This commit is contained in:
D G Turner 2019-05-07 01:39:12 +01:00
parent 24bf47a28b
commit 21450facee
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
audio/softsynth/mt32/MidiEventQueue.h
View file

@ -32,6 +32,7 @@ struct MidiEvent {
Bit32u sysexLength; Bit32u sysexLength;
Bit32u timestamp; Bit32u timestamp;
MidiEvent();
~MidiEvent(); ~MidiEvent();
void setShortMessage(Bit32u shortMessageData, Bit32u timestamp); void setShortMessage(Bit32u shortMessageData, Bit32u timestamp);
void setSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp); void setSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);

8
audio/softsynth/mt32/Synth.cpp
View file

@ -1753,6 +1753,13 @@ Bit32s Synth::getMasterTunePitchDelta() const {
return extensions.masterTunePitchDelta; return extensions.masterTunePitchDelta;
} }
MidiEvent::MidiEvent() {
shortMessageData = 0;
sysexData = NULL;
sysexLength = 0;
timestamp = 0;
}
MidiEvent::~MidiEvent() { MidiEvent::~MidiEvent() {
if (sysexData != NULL) { if (sysexData != NULL) {
delete[] sysexData; 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) { MidiEventQueue::MidiEventQueue(Bit32u useRingBufferSize) : ringBuffer(new MidiEvent[useRingBufferSize]), ringBufferMask(useRingBufferSize - 1) {
memset(ringBuffer, 0, useRingBufferSize * sizeof(MidiEvent));
reset(); reset();
} }