[Scummvm-git-logs] scummvm master -> d9bcf03903e51a8ec270dc89023ace0d62b33bf1

[sev-]

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:
d9bcf03903 AUDIO: Fix warnings


Commit: d9bcf03903e51a8ec270dc89023ace0d62b33bf1
    https://github.com/scummvm/scummvm/commit/d9bcf03903e51a8ec270dc89023ace0d62b33bf1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-08T10:38:25+02:00

Commit Message:
AUDIO: Fix warnings

Changed paths:
    audio/soundfont/vab/psxspu.cpp
    audio/soundfont/vab/psxspu.h


diff --git a/audio/soundfont/vab/psxspu.cpp b/audio/soundfont/vab/psxspu.cpp
index faddb78db0..8041cf479d 100644
--- a/audio/soundfont/vab/psxspu.cpp
+++ b/audio/soundfont/vab/psxspu.cpp
@@ -148,7 +148,7 @@ bool PSXSampColl::GetSampleInfo() {
 
 			if (isSample) {
 				uint32 extraGunkLength = 0;
-				uint8 filterRangeByte = GetByte(i + 16);
+				//uint8 filterRangeByte = GetByte(i + 16);
 				uint8 keyFlagByte = GetByte(i + 16 + 1);
 				if ((keyFlagByte & 0xF8) != 0)
 					break;
diff --git a/audio/soundfont/vab/psxspu.h b/audio/soundfont/vab/psxspu.h
index b46f278dd4..4e662b8240 100644
--- a/audio/soundfont/vab/psxspu.h
+++ b/audio/soundfont/vab/psxspu.h
@@ -76,7 +76,7 @@ typedef struct _VAGBlk {
 double LinAmpDecayTimeToLinDBDecayTime(double secondsToFullAtten, int linearVolumeRange);
 
 // InitADSR is shamelessly ripped from P.E.Op.S
-static void InitADSR() {
+static inline void InitADSR() {
 	unsigned long r, rs, rd;
 	int i;