aboutsummaryrefslogtreecommitdiff
path: root/audio/mods
diff options
context:
space:
mode:
authorD G Turner2019-11-17 08:20:01 +0000
committerD G Turner2019-11-17 08:20:01 +0000
commit28287d70b6879ab140b90150d9bc747fbc17510d (patch)
tree4f833cfda95a2935693d0644e3c6024e0df2f8c6 /audio/mods
parent3d112e1622f416223e24e631af38960bb1c0e514 (diff)
downloadscummvm-rg350-28287d70b6879ab140b90150d9bc747fbc17510d.tar.gz
scummvm-rg350-28287d70b6879ab140b90150d9bc747fbc17510d.tar.bz2
scummvm-rg350-28287d70b6879ab140b90150d9bc747fbc17510d.zip
AUDIO: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'audio/mods')
-rw-r--r--audio/mods/infogrames.cpp3
-rw-r--r--audio/mods/mod_xm_s3m.cpp14
-rw-r--r--audio/mods/protracker.cpp4
-rw-r--r--audio/mods/rjp1.cpp6
-rw-r--r--audio/mods/soundfx.cpp4
5 files changed, 31 insertions, 0 deletions
diff --git a/audio/mods/infogrames.cpp b/audio/mods/infogrames.cpp
index 320261b1b0..2c62c37713 100644
--- a/audio/mods/infogrames.cpp
+++ b/audio/mods/infogrames.cpp
@@ -346,8 +346,11 @@ void Infogrames::getNextSample(Channel &chn) {
break;
default:
warning("Unknown Infogrames command: %X", cmd);
+ break;
}
break;
+ default:
+ break;
}
} else { // 0xxxxxxx - Set period
if (cmd != 0)
diff --git a/audio/mods/mod_xm_s3m.cpp b/audio/mods/mod_xm_s3m.cpp
index 264dfdc46c..3542d2c2fc 100644
--- a/audio/mods/mod_xm_s3m.cpp
+++ b/audio/mods/mod_xm_s3m.cpp
@@ -278,6 +278,8 @@ void ModXmS3mStream::tickChannel(Channel &channel) {
case 0xF0: /* Tone Porta.*/
tonePorta(channel);
break;
+ default:
+ break;
}
}
switch (channel.note.effect) {
@@ -375,6 +377,8 @@ void ModXmS3mStream::tickChannel(Channel &channel) {
channel.vibratoPhase += channel.vibratoSpeed;
vibrato(channel, 1);
break;
+ default:
+ break;
}
autoVibrato(channel);
calculateFreq(channel);
@@ -567,6 +571,8 @@ void ModXmS3mStream::retrigVolSlide(Channel &channel) {
case 0xF:
channel.volume = channel.volume << 1;
break;
+ default:
+ break;
}
if (channel.volume < 0) {
channel.volume = 0;
@@ -639,6 +645,8 @@ void ModXmS3mStream::trigger(Channel &channel) {
channel.tonePortaParam = channel.note.volume & 0xF;
}
break;
+ default:
+ break;
}
if (channel.note.key > 0) {
if (channel.note.key > 96) {
@@ -883,6 +891,8 @@ void ModXmS3mStream::updateChannelRow(Channel &channel, Note note) {
case 0x20:
portaDown(channel, 0xE0 | (channel.xfinePortaParam & 0xF));
break;
+ default:
+ break;
}
break;
case 0x71: /* Fine Porta Up. */
@@ -950,6 +960,8 @@ void ModXmS3mStream::updateChannelRow(Channel &channel, Note note) {
case 0xF8: /* Set Panning. */
channel.panning = channel.note.param * 17;
break;
+ default:
+ break;
}
autoVibrato(channel);
calculateFreq(channel);
@@ -1091,6 +1103,8 @@ void ModXmS3mStream::updateRow() {
case 0xFE: /* Pattern Delay.*/
_tick = _speed + _speed * note.param;
break;
+ default:
+ break;
}
}
}
diff --git a/audio/mods/protracker.cpp b/audio/mods/protracker.cpp
index 2838b58d61..74df6d9697 100644
--- a/audio/mods/protracker.cpp
+++ b/audio/mods/protracker.cpp
@@ -398,8 +398,12 @@ void ProtrackerStream::updateEffects() {
_track[track].vol = _module.sample[_track[track].sample - 1].vol;
}
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
}
}
diff --git a/audio/mods/rjp1.cpp b/audio/mods/rjp1.cpp
index f2b811c9ef..f4b6dd5713 100644
--- a/audio/mods/rjp1.cpp
+++ b/audio/mods/rjp1.cpp
@@ -163,6 +163,8 @@ bool Rjp1::load(Common::SeekableReadStream *songData, Common::SeekableReadStream
case 6:
// sequence data
break;
+ default:
+ break;
}
}
@@ -284,6 +286,8 @@ bool Rjp1::executeSfxSequenceOp(Rjp1Channel *channel, uint8 code, const uint8 *&
case 7:
loop = false;
break;
+ default:
+ break;
}
return loop;
}
@@ -345,6 +349,8 @@ bool Rjp1::executeSongSequenceOp(Rjp1Channel *channel, uint8 code, const uint8 *
case 7:
loop = false;
break;
+ default:
+ break;
}
return loop;
}
diff --git a/audio/mods/soundfx.cpp b/audio/mods/soundfx.cpp
index 5744429856..2b4c4c9dba 100644
--- a/audio/mods/soundfx.cpp
+++ b/audio/mods/soundfx.cpp
@@ -198,6 +198,8 @@ void SoundFx::handlePattern(int ch, uint32 pat) {
volume = 0;
}
break;
+ default:
+ break;
}
setChannelVolume(ch, volume);
}
@@ -218,6 +220,8 @@ void SoundFx::updateEffects(int ch) {
case 8: // set step down
warning("Unhandled effect %d", _effects[ch]);
break;
+ default:
+ break;
}
}
}