[Scummvm-cvs-logs] scummvm master -> f8d0a48dcd7efc9194cc3ae13bfbbd883d6a3836
lordhoto
lordhoto at gmail.com
Fri Jul 11 00:40:37 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:
f8d0a48dcd Revert "MT32: Avoid runtime abort due to non-POD object pass in MT32 Emulator."
Commit: f8d0a48dcd7efc9194cc3ae13bfbbd883d6a3836
https://github.com/scummvm/scummvm/commit/f8d0a48dcd7efc9194cc3ae13bfbbd883d6a3836
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-11T00:38:31+02:00
Commit Message:
Revert "MT32: Avoid runtime abort due to non-POD object pass in MT32 Emulator."
This reverts commit 6731eb21e3e4c1fa2470ed03a3547d45b3dff6e3.
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 50b3fe6..c6ecf47 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -15,6 +15,11 @@
* 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"
@@ -94,6 +99,11 @@ 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);
}
@@ -106,9 +116,9 @@ void Synth::printDebug(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
#if MT32EMU_DEBUG_SAMPLESTAMPS > 0
- debug("[%u] ", renderedSampleCount);
+ reportHandler->printDebug("[%u] ", renderedSampleCount);
#endif
- debug(fmt, ap);
+ reportHandler->printDebug(fmt, ap);
va_end(ap);
}
diff --git a/audio/softsynth/mt32/Synth.h b/audio/softsynth/mt32/Synth.h
index 2ad0028..37fb7b2 100644
--- a/audio/softsynth/mt32/Synth.h
+++ b/audio/softsynth/mt32/Synth.h
@@ -236,6 +236,10 @@ 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