[Scummvm-cvs-logs] scummvm master -> 6731eb21e3e4c1fa2470ed03a3547d45b3dff6e3

digitall dgturner at iee.org
Fri Jul 11 00:08:23 CEST 2014


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:
6731eb21e3 MT32: Avoid runtime abort due to non-POD object pass in MT32 Emulator.


Commit: 6731eb21e3e4c1fa2470ed03a3547d45b3dff6e3
    https://github.com/scummvm/scummvm/commit/6731eb21e3e4c1fa2470ed03a3547d45b3dff6e3
Author: D G Turner (digitall at scummvm.org)
Date: 2014-07-10T23:11:20+01:00

Commit Message:
MT32: Avoid runtime abort due to non-POD object pass in MT32 Emulator.

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



diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index c6ecf47..50b3fe6 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -15,11 +15,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include <cerrno>
-//#include <cmath>
-//#include <cstdlib>
-//#include <cstring>
-
 #include "mt32emu.h"
 #include "mmath.h"
 #include "PartialManager.h"
@@ -99,11 +94,6 @@ void ReportHandler::showLCDMessage(const char *data) {
 	debug("\n");
 }
 
-void ReportHandler::printDebug(const char *fmt, va_list list) {
-	debug(fmt, list);
-	debug("\n");
-}
-
 void Synth::polyStateChanged(int partNum) {
 	reportHandler->onPolyStateChanged(partNum);
 }
@@ -116,9 +106,9 @@ void Synth::printDebug(const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
 #if MT32EMU_DEBUG_SAMPLESTAMPS > 0
-	reportHandler->printDebug("[%u] ", renderedSampleCount);
+	debug("[%u] ", renderedSampleCount);
 #endif
-	reportHandler->printDebug(fmt, ap);
+	debug(fmt, ap);
 	va_end(ap);
 }
 
diff --git a/audio/softsynth/mt32/Synth.h b/audio/softsynth/mt32/Synth.h
index 37fb7b2..2ad0028 100644
--- a/audio/softsynth/mt32/Synth.h
+++ b/audio/softsynth/mt32/Synth.h
@@ -236,10 +236,6 @@ public:
 	virtual ~ReportHandler() {}
 
 protected:
-
-	// Callback for debug messages, in vprintf() format
-	virtual void printDebug(const char *fmt, va_list list);
-
 	// Callbacks for reporting various errors and information
 	virtual void onErrorControlROM() {}
 	virtual void onErrorPCMROM() {}






More information about the Scummvm-git-logs mailing list