aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth
diff options
context:
space:
mode:
authorD G Turner2017-01-14 09:14:02 +0000
committerD G Turner2017-01-14 09:14:02 +0000
commit77818e968392301eacf718a56518ea1b63815c72 (patch)
tree563e3c7b274fcd2caea67368ccd1a16a97c4b9df /audio/softsynth
parent72790f90c20c12b2cebfc66386123996f86cb010 (diff)
downloadscummvm-rg350-77818e968392301eacf718a56518ea1b63815c72.tar.gz
scummvm-rg350-77818e968392301eacf718a56518ea1b63815c72.tar.bz2
scummvm-rg350-77818e968392301eacf718a56518ea1b63815c72.zip
MT32: Fix Set-But-Unused Compiler Warning.
Diffstat (limited to 'audio/softsynth')
-rwxr-xr-xaudio/softsynth/mt32/File.cpp4
-rwxr-xr-xaudio/softsynth/mt32/File.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/audio/softsynth/mt32/File.cpp b/audio/softsynth/mt32/File.cpp
index 395a893358..333230b61c 100755
--- a/audio/softsynth/mt32/File.cpp
+++ b/audio/softsynth/mt32/File.cpp
@@ -24,11 +24,11 @@
namespace MT32Emu {
-AbstractFile::AbstractFile() : sha1DigestCalculated(false), reserved(NULL) {
+AbstractFile::AbstractFile() : sha1DigestCalculated(false) {
sha1Digest[0] = 0;
}
-AbstractFile::AbstractFile(const SHA1Digest &useSHA1Digest) : sha1DigestCalculated(true), reserved(NULL) {
+AbstractFile::AbstractFile(const SHA1Digest &useSHA1Digest) : sha1DigestCalculated(true) {
memcpy(sha1Digest, useSHA1Digest, sizeof(SHA1Digest) - 1);
sha1Digest[sizeof(SHA1Digest) - 1] = 0; // Ensure terminator char.
}
diff --git a/audio/softsynth/mt32/File.h b/audio/softsynth/mt32/File.h
index c9a7d582b4..f29d4f3c42 100755
--- a/audio/softsynth/mt32/File.h
+++ b/audio/softsynth/mt32/File.h
@@ -49,9 +49,6 @@ protected:
private:
bool sha1DigestCalculated;
SHA1Digest sha1Digest;
-
- // Binary compatibility helper.
- void *reserved;
};
class MT32EMU_EXPORT ArrayFile : public AbstractFile {