[Scummvm-cvs-logs] scummvm master -> 0864edea54c709c00948ac335430280f4a5376c9

wjp wjp at usecode.org
Thu Feb 9 23:09:24 CET 2012


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:
0864edea54 MT32: Fix warning


Commit: 0864edea54c709c00948ac335430280f4a5376c9
    https://github.com/scummvm/scummvm/commit/0864edea54c709c00948ac335430280f4a5376c9
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-02-09T14:07:58-08:00

Commit Message:
MT32: Fix warning

The workaround for the unused parameter warning caused a warning:
parameter 'patchNum' set but not used

Changed paths:
    audio/softsynth/mt32/Part.cpp



diff --git a/audio/softsynth/mt32/Part.cpp b/audio/softsynth/mt32/Part.cpp
index 8c646b2..c9bd86b 100644
--- a/audio/softsynth/mt32/Part.cpp
+++ b/audio/softsynth/mt32/Part.cpp
@@ -220,13 +220,13 @@ unsigned int Part::getAbsTimbreNum() const {
 	return (patchTemp->patch.timbreGroup * 64) + patchTemp->patch.timbreNum;
 }
 
-void RhythmPart::setProgram(unsigned int patchNum) {
 #if MT32EMU_MONITOR_MIDI > 0
+void RhythmPart::setProgram(unsigned int patchNum) {
 	synth->printDebug("%s: Attempt to set program (%d) on rhythm is invalid", name, patchNum);
+}
 #else
-	patchNum = 0; // Just to avoid unused variable warning
+void RhythmPart::setProgram(unsigned int) { }
 #endif
-}
 
 void Part::setProgram(unsigned int patchNum) {
 	setPatch(&synth->mt32ram.patches[patchNum]);






More information about the Scummvm-git-logs mailing list