[Scummvm-cvs-logs] scummvm master -> 635847b979753e1ad54ebfb52a0510e61b38be53

[bluegr]

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

Summary:
6c3e05e678 AUDIO: Add missing breaks to switch statement - CID 1003770
635847b979 MT32: Fix some non-initialized fields in MidiDriver_MT32 - CID 1002949


Commit: 6c3e05e678361e69a0b323a863cea76e0516267f
    https://github.com/scummvm/scummvm/commit/6c3e05e678361e69a0b323a863cea76e0516267f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-05-01T05:46:23-07:00

Commit Message:
AUDIO: Add missing breaks to switch statement - CID 1003770

A mistake in commit 3dc788da63520b8baad2b5c0726f34168ab55356

Changed paths:
    audio/midiparser_smf.cpp



diff --git a/audio/midiparser_smf.cpp b/audio/midiparser_smf.cpp
index 4b0913c..6c64d1e 100644
--- a/audio/midiparser_smf.cpp
+++ b/audio/midiparser_smf.cpp
@@ -56,8 +56,10 @@ void MidiParser_SMF::property(int prop, int value) {
 	switch (prop) {
 	case mpMalformedPitchBends:
 		_malformedPitchBends = (value > 0);
+		break;
 	default:
 		MidiParser::property(prop, value);
+		break;
 	}
 }
 


Commit: 635847b979753e1ad54ebfb52a0510e61b38be53
    https://github.com/scummvm/scummvm/commit/635847b979753e1ad54ebfb52a0510e61b38be53
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-05-01T05:46:23-07:00

Commit Message:
MT32: Fix some non-initialized fields in MidiDriver_MT32 - CID 1002949

Changed paths:
    audio/softsynth/mt32.cpp



diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index d974492..3ae8e14 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -156,6 +156,12 @@ MidiDriver_MT32::MidiDriver_MT32(Audio::Mixer *mixer) : MidiDriver_Emulated(mixe
 	// rely on Mixer to convert.
 	_outputRate = 32000; //_mixer->getOutputRate();
 	_initializing = false;
+
+	// Initialized in open()
+	_controlROM = NULL;
+	_pcmROM = NULL;
+	_controlFile = NULL;
+	_pcmFile = NULL;
 }
 
 MidiDriver_MT32::~MidiDriver_MT32() {