aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2004-11-15 23:33:06 +0000
committerMax Horn2004-11-15 23:33:06 +0000
commit525df7cff072bec7c3d0af96513a6d0d3010f7d0 (patch)
tree66314348c0c45c7f1e837fecbf25f018516e82ea /backends
parent503da271884f77b3a0f77e1cd54223c0397d8f07 (diff)
downloadscummvm-rg350-525df7cff072bec7c3d0af96513a6d0d3010f7d0.tar.gz
scummvm-rg350-525df7cff072bec7c3d0af96513a6d0d3010f7d0.tar.bz2
scummvm-rg350-525df7cff072bec7c3d0af96513a6d0d3010f7d0.zip
const const const
svn-id: r15825
Diffstat (limited to 'backends')
-rw-r--r--backends/midi/mt32.cpp4
-rw-r--r--backends/midi/mt32/synth.cpp4
-rw-r--r--backends/midi/mt32/synth.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/backends/midi/mt32.cpp b/backends/midi/mt32.cpp
index a202ed7bec..73775639f1 100644
--- a/backends/midi/mt32.cpp
+++ b/backends/midi/mt32.cpp
@@ -122,10 +122,10 @@ static void MT32_PrintDebug(void *userData, const char *fmt, va_list list) {
//vdebug(0, fmt, list); // FIXME: Use a higher debug level
}
-static void MT32_Report(void *userData, MT32Emu::ReportType type, void *reportData) {
+static void MT32_Report(void *userData, MT32Emu::ReportType type, const void *reportData) {
switch(type) {
case MT32Emu::ReportType_lcdMessage:
- g_system->displayMessageOnOSD((char *)reportData);
+ g_system->displayMessageOnOSD((const char *)reportData);
break;
case MT32Emu::ReportType_errorPreset1:
error("Couldn't open Preset1.syx file");
diff --git a/backends/midi/mt32/synth.cpp b/backends/midi/mt32/synth.cpp
index 9e11fb2bbf..9361c3bda9 100644
--- a/backends/midi/mt32/synth.cpp
+++ b/backends/midi/mt32/synth.cpp
@@ -125,7 +125,7 @@ Synth::~Synth() {
close(); // Make sure we're closed and everything is freed
}
-void Synth::report(ReportType type, void *data) {
+void Synth::report(ReportType type, const void *data) {
if (myProp.report != NULL) {
myProp.report(myProp.userData, type, data);
}
@@ -716,7 +716,7 @@ void Synth::close(void) {
}
}
- isOpen=false;
+ isOpen = false;
}
void Synth::playMsg(Bit32u msg) {
diff --git a/backends/midi/mt32/synth.h b/backends/midi/mt32/synth.h
index 3609592a2f..dbd77c1dfd 100644
--- a/backends/midi/mt32/synth.h
+++ b/backends/midi/mt32/synth.h
@@ -84,7 +84,7 @@ struct SynthProperties {
// This is used as the first argument to all callbacks
void *userData;
// Callback for reporting various errors and information. May be NULL
- void (*report)(void *userData, ReportType type, void *reportData);
+ void (*report)(void *userData, ReportType type, const void *reportData);
// Callback for debug messages, in vprintf() format
void (*printDebug)(void *userData, const char *fmt, va_list list);
// Callback for providing an implementation of File, opened and ready for use
@@ -163,7 +163,7 @@ private:
int dumpSysex(char *filename);
protected:
- void report(ReportType type, void *reportData);
+ void report(ReportType type, const void *reportData);
File *openFile(const char *filename, File::OpenMode mode);
void closeFile(File *file);
void printDebug(const char *fmt, ...);