aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth
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/softsynth
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/softsynth')
-rw-r--r--audio/softsynth/cms.cpp1
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp5
-rw-r--r--audio/softsynth/mt32.cpp2
-rw-r--r--audio/softsynth/opl/dbopl.cpp15
-rw-r--r--audio/softsynth/opl/dosbox.cpp54
-rw-r--r--audio/softsynth/opl/mame.cpp6
-rw-r--r--audio/softsynth/opl/nuked.cpp20
-rw-r--r--audio/softsynth/sid.cpp4
8 files changed, 86 insertions, 21 deletions
diff --git a/audio/softsynth/cms.cpp b/audio/softsynth/cms.cpp
index ce058b515b..4ea2a9c67a 100644
--- a/audio/softsynth/cms.cpp
+++ b/audio/softsynth/cms.cpp
@@ -179,6 +179,7 @@ void CMSEmulator::update(int chip, int16 *buffer, int length) {
case 1: saa->noise[ch].freq = 15625.0 * 2; break;
case 2: saa->noise[ch].freq = 7812.5 * 2; break;
case 3: saa->noise[ch].freq = saa->channels[ch * 3].freq; break;
+ default: break;
}
}
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index 0cdf18378d..540c1d943a 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -230,6 +230,9 @@ void TownsPC98_FmSynthOperator::generateOutput(int32 phasebuf, int32 *feed, int3
targetLevel = 1023;
levelIncrement = _adTbl[fs_r.rate + ((_tickCount >> fs_r.shift) & 7)];
break;
+
+ default:
+ break;
}
loop = false;
}
@@ -1536,6 +1539,8 @@ void TownsPC98_FmSynth::nextTick(int32 *buffer, uint32 bufferSize) {
o[3]->generateOutput(0, 0, output);
*del = 0;
break;
+ default:
+ break;
};
int32 finOut = (output << 2) / ((_numChan + _numSSG - 3) / 3);
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index 09a8083f7b..47ac9f1cdc 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -290,6 +290,8 @@ uint32 MidiDriver_MT32::property(int prop, uint32 param) {
case PROP_CHANNEL_MASK:
_channelMask = param & 0xFFFF;
return 1;
+ default:
+ break;
}
return 0;
diff --git a/audio/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp
index 19be94cf69..275a1caa00 100644
--- a/audio/softsynth/opl/dbopl.cpp
+++ b/audio/softsynth/opl/dbopl.cpp
@@ -422,6 +422,8 @@ Bits Operator::TemplateVolume( ) {
return ENV_MAX;
}
break;
+ default:
+ break;
}
volume = vol;
return vol;
@@ -753,6 +755,8 @@ void Channel::WriteC0( const Chip* chip, Bit8u val ) {
case 3:
chan0->synthHandler = &Channel::BlockTemplate< sm3AMAM >;
break;
+ default:
+ break;
}
//Disable updating percussion channels
} else if ((fourMask & 0x40) && ( chip->regBD & 0x20) ) {
@@ -900,6 +904,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
// thus we leave this blank.
// TODO: Consider checking this.
break;
+ default:
+ break;
}
//Init the operators with the the current vibrato and tremolo values
Op( 0 )->Prepare( chip );
@@ -985,6 +991,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
// thus we leave this blank.
// TODO: Consider checking this.
break;
+ default:
+ break;
}
}
switch( mode ) {
@@ -1011,6 +1019,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
// thus we leave this blank.
// TODO: Consider checking this.
break;
+ default:
+ break;
}
return 0;
}
@@ -1203,6 +1213,8 @@ void Chip::WriteReg( Bit32u reg, Bit8u val ) {
case 0xf0 >> 4:
REGOP( WriteE0 );
break;
+ default:
+ break;
}
}
@@ -1216,6 +1228,9 @@ Bit32u Chip::WriteAddr( Bit32u port, Bit8u val ) {
return 0x100 | val;
else
return val;
+ break;
+ default:
+ break;
}
return 0;
}
diff --git a/audio/softsynth/opl/dosbox.cpp b/audio/softsynth/opl/dosbox.cpp
index 3d90ec93d0..91e81d6bf2 100644
--- a/audio/softsynth/opl/dosbox.cpp
+++ b/audio/softsynth/opl/dosbox.cpp
@@ -92,36 +92,40 @@ bool Chip::write(uint32 reg, uint8 val) {
timer[1].counter = val;
return true;
case 0x04:
- double time = g_system->getMillis() / 1000.0;
+ {
+ double time = g_system->getMillis() / 1000.0;
- if (val & 0x80) {
- timer[0].reset(time);
- timer[1].reset(time);
- } else {
- timer[0].update(time);
- timer[1].update(time);
+ if (val & 0x80) {
+ timer[0].reset(time);
+ timer[1].reset(time);
+ } else {
+ timer[0].update(time);
+ timer[1].update(time);
- if (val & 0x1)
- timer[0].start(time, 80);
- else
- timer[0].stop();
+ if (val & 0x1)
+ timer[0].start(time, 80);
+ else
+ timer[0].stop();
- timer[0].masked = (val & 0x40) > 0;
+ timer[0].masked = (val & 0x40) > 0;
- if (timer[0].masked)
- timer[0].overflow = false;
+ if (timer[0].masked)
+ timer[0].overflow = false;
- if (val & 0x2)
- timer[1].start(time, 320);
- else
- timer[1].stop();
+ if (val & 0x2)
+ timer[1].start(time, 320);
+ else
+ timer[1].stop();
- timer[1].masked = (val & 0x20) > 0;
+ timer[1].masked = (val & 0x20) > 0;
- if (timer[1].masked)
- timer[1].overflow = false;
+ if (timer[1].masked)
+ timer[1].overflow = false;
+ }
}
return true;
+ default:
+ break;
}
return false;
}
@@ -203,6 +207,8 @@ void OPL::write(int port, int val) {
dualWrite(1, _reg.dual[1], val);
}
break;
+ default:
+ break;
}
} else {
// Ask the handler to write the address
@@ -224,6 +230,8 @@ void OPL::write(int port, int val) {
_reg.dual[1] = val & 0xff;
}
break;
+ default:
+ break;
}
}
}
@@ -245,6 +253,8 @@ byte OPL::read(int port) {
return 0xff;
// Make sure the low bits are 6 on opl2
return _chip[(port >> 1) & 1].read() | 0x6;
+ default:
+ break;
}
return 0;
}
@@ -282,6 +292,8 @@ void OPL::writeReg(int r, int v) {
write(0x388, tempReg);
}
break;
+ default:
+ break;
};
}
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index 0903f335cf..6574b46497 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -409,6 +409,8 @@ inline uint OPL_CALC_SLOT(OPL_SLOT *SLOT) {
SLOT->eve = EG_OFF + 1;
SLOT->evs = 0;
break;
+ default:
+ break;
}
}
/* calcrate envelope */
@@ -859,6 +861,8 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) {
}
}
return;
+ default:
+ break;
}
break;
case 0x20: /* am,vib,ksr,eg type,mul */
@@ -995,6 +999,8 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) {
CH->SLOT[slot&1].wavetable = &SIN_TABLE[(v & 0x03) * SIN_ENT];
}
return;
+ default:
+ break;
}
}
diff --git a/audio/softsynth/opl/nuked.cpp b/audio/softsynth/opl/nuked.cpp
index 273cbdfa18..ce81926ae6 100644
--- a/audio/softsynth/opl/nuked.cpp
+++ b/audio/softsynth/opl/nuked.cpp
@@ -403,6 +403,8 @@ static void OPL3_EnvelopeCalc(opl3_slot *slot)
case envelope_gen_num_release:
reg_rate = slot->reg_rr;
break;
+ default:
+ break;
}
}
slot->pg_reset = reset;
@@ -498,6 +500,8 @@ static void OPL3_EnvelopeCalc(opl3_slot *slot)
eg_inc = 1 << (shift - 1);
}
break;
+ default:
+ break;
}
slot->eg_rout = (eg_rout + eg_inc) & 0x1ff;
// Key off
@@ -845,6 +849,8 @@ static void OPL3_ChannelSetupAlg(opl3_channel *channel)
channel->slots[0]->mod = &channel->slots[0]->fbmod;
channel->slots[1]->mod = &channel->chip->zeromod;
break;
+ default:
+ break;
}
return;
}
@@ -900,6 +906,8 @@ static void OPL3_ChannelSetupAlg(opl3_channel *channel)
channel->out[2] = &channel->slots[1]->out;
channel->out[3] = &channel->chip->zeromod;
break;
+ default:
+ break;
}
}
else
@@ -922,6 +930,8 @@ static void OPL3_ChannelSetupAlg(opl3_channel *channel)
channel->out[2] = &channel->chip->zeromod;
channel->out[3] = &channel->chip->zeromod;
break;
+ default:
+ break;
}
}
}
@@ -1262,6 +1272,8 @@ void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
case 0x05:
chip->newm = v & 0x01;
break;
+ default:
+ break;
}
}
else
@@ -1271,6 +1283,8 @@ void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
case 0x08:
chip->nts = (v >> 6) & 0x01;
break;
+ default:
+ break;
}
}
break;
@@ -1341,6 +1355,8 @@ void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
OPL3_ChannelWriteC0(&chip->channel[9 * high + (regm & 0x0f)], v);
}
break;
+ default:
+ break;
}
}
@@ -1424,6 +1440,8 @@ void OPL::write(int port, int val) {
dualWrite(1, address[1], val);
}
break;
+ default:
+ break;
}
} else {
switch (_type) {
@@ -1444,6 +1462,8 @@ void OPL::write(int port, int val) {
case Config::kOpl3:
address[0] = (val & 0xff) | ((port << 7) & 0x100);
break;
+ default:
+ break;
}
}
}
diff --git a/audio/softsynth/sid.cpp b/audio/softsynth/sid.cpp
index ac26922514..760916f1d6 100644
--- a/audio/softsynth/sid.cpp
+++ b/audio/softsynth/sid.cpp
@@ -951,6 +951,8 @@ RESID_INLINE void EnvelopeGenerator::updateClock(cycle_count delta_t) {
//
--envelope_counter &= 0xff;
break;
+ default:
+ break;
}
// Check for change of exponential counter period.
@@ -980,6 +982,8 @@ RESID_INLINE void EnvelopeGenerator::updateClock(cycle_count delta_t) {
// This has been verified by sampling ENV3.
hold_zero = true;
break;
+ default:
+ break;
}
}