[Scummvm-cvs-logs] scummvm master -> 32df9f77592e1fb709a21e9d1a1bb5b14b15df78

[lordhoto]

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:
32df9f7759 MT32: Comment out default showLCDMessage/printDebug implementations.


Commit: 32df9f77592e1fb709a21e9d1a1bb5b14b15df78
    https://github.com/scummvm/scummvm/commit/32df9f77592e1fb709a21e9d1a1bb5b14b15df78
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-11T00:56:10+02:00

Commit Message:
MT32: Comment out default showLCDMessage/printDebug implementations.

This keeps the original MUNT code in showLCDMessage/printDebug and simply
comments it out. This *silences* a warning about debug use in our former
default replacement code. Since we already implement a ReportHandler there
is no need to adapt the default implementation.

This is not the cleanest way but the solution which requires the least changes
to MUNT code.

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



diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index c6ecf47..5ed172f 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -95,13 +95,23 @@ Synth::~Synth() {
 }
 
 void ReportHandler::showLCDMessage(const char *data) {
-	debug("WRITE-LCD: %s", data);
-	debug("\n");
+	// We cannot use printf here. Since we already implement our own
+	// ReportHandler we simply disable the default implementation since it is
+	// never called anyway.
+#if 0
+	printf("WRITE-LCD: %s", data);
+	printf("\n");
+#endif
 }
 
 void ReportHandler::printDebug(const char *fmt, va_list list) {
-	debug(fmt, list);
-	debug("\n");
+	// We cannot use (v)printf here. Since we already implement our own
+	// ReportHandler we simply disable the default implementation since it is
+	// never called anyway.
+#if 0
+	vprintf(fmt, list);
+	printf("\n");
+#endif
 }
 
 void Synth::polyStateChanged(int partNum) {