From 6731eb21e3e4c1fa2470ed03a3547d45b3dff6e3 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 10 Jul 2014 23:11:20 +0100
Subject: MT32: Avoid runtime abort due to non-POD object pass in MT32
 Emulator.

---
 audio/softsynth/mt32/Synth.cpp | 14 ++------------
 audio/softsynth/mt32/Synth.h   |  4 ----
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'audio')

diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index c6ecf47cad..50b3fe610c 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 37fb7b280a..2ad0028e1f 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() {}
-- 
cgit v1.2.3