diff options
| author | Torbjörn Andersson | 2017-08-06 16:54:38 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2017-08-06 16:54:38 +0200 |
| commit | 665f5c99b2ca3db67f75ecfa683389e213d942a6 (patch) | |
| tree | 4d519f502a58eb8ac3cf1c73beed10396bbaccdf /audio | |
| parent | a57c5b385decbd4c1bf15f2eace01bf7cb33f246 (diff) | |
| download | scummvm-rg350-665f5c99b2ca3db67f75ecfa683389e213d942a6.tar.gz scummvm-rg350-665f5c99b2ca3db67f75ecfa683389e213d942a6.tar.bz2 scummvm-rg350-665f5c99b2ca3db67f75ecfa683389e213d942a6.zip | |
JANITORIAL: Silence some more GCC 7 fall through warnings
I think these are the last one that were already flagged as being
deliberate.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mods/tfmx.cpp | 6 | ||||
| -rwxr-xr-x | audio/softsynth/mt32/Synth.cpp | 4 | ||||
| -rw-r--r-- | audio/softsynth/opl/dbopl.cpp | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp index db3dad88ef..8d31faa104 100644 --- a/audio/mods/tfmx.cpp +++ b/audio/mods/tfmx.cpp @@ -230,7 +230,7 @@ void Tfmx::macroRun(ChannelContext &channel) { switch (macroPtr[0]) { case 0x00: // Reset + DMA Off. Parameters: deferWait, addset, vol clearEffects(channel); - // FT + // fall through case 0x13: // DMA Off. Parameters: deferWait, addset, vol // TODO: implement PArameters Paula::disableChannel(channel.paulaChannel); @@ -285,7 +285,7 @@ void Tfmx::macroRun(ChannelContext &channel) { case 0x10: // Loop Key Up. Parameters: Loopcount, MacroStep(W) if (channel.keyUp) continue; - // FT + // fall through case 0x05: // Loop. Parameters: Loopcount, MacroStep(W) if (channel.macroLoopCount != 0) { if (channel.macroLoopCount == 0xFF) @@ -554,7 +554,7 @@ bool Tfmx::patternRun(PatternContext &pattern) { case 14: // Stop custompattern // TODO apparently toggles on/off pattern channel 7 debug(3, "Tfmx: Encountered 'Stop custompattern' command"); - // FT + // fall through case 4: // Stop this pattern pattern.command = 0xFF; --pattern.step; diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp index 00832c5d50..3a478b5b62 100755 --- a/audio/softsynth/mt32/Synth.cpp +++ b/audio/softsynth/mt32/Synth.cpp @@ -1057,7 +1057,7 @@ void Synth::playSysexWithoutHeader(Bit8u device, Bit8u command, const Bit8u *sys break; } */ - // Deliberate fall-through + // fall through case SYSEX_CMD_DT1: writeSysex(device, sysex, len); break; @@ -1067,7 +1067,7 @@ void Synth::playSysexWithoutHeader(Bit8u device, Bit8u command, const Bit8u *sys // FIXME: We should send SYSEX_CMD_RJC in this case break; } - // Deliberate fall-through + // fall through case SYSEX_CMD_RQ1: readSysex(device, sysex, len); break; diff --git a/audio/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp index 43eb40e7ba..19be94cf69 100644 --- a/audio/softsynth/opl/dbopl.cpp +++ b/audio/softsynth/opl/dbopl.cpp @@ -413,6 +413,7 @@ Bits Operator::TemplateVolume( ) { return vol; } //In sustain phase, but not sustaining, do regular release + //fall through case RELEASE: vol += RateForward( releaseAdd ); if ( GCC_UNLIKELY(vol >= ENV_MAX) ) { |