diff options
| author | Florian Kagerer | 2010-12-18 12:17:33 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-12-18 12:17:33 +0000 |
| commit | 41acf18a5376f47c9965263ad5fdc8cc2b3a8005 (patch) | |
| tree | 590c807d39389441455200149e4a6c9b18675f0e /sound/softsynth | |
| parent | 03da126ec7c5e2c8d1406a4fdd7b9b0e73616be5 (diff) | |
| download | scummvm-rg350-41acf18a5376f47c9965263ad5fdc8cc2b3a8005.tar.gz scummvm-rg350-41acf18a5376f47c9965263ad5fdc8cc2b3a8005.tar.bz2 scummvm-rg350-41acf18a5376f47c9965263ad5fdc8cc2b3a8005.zip | |
FMTOWNS AUDIO: formatting
svn-id: r54950
Diffstat (limited to 'sound/softsynth')
| -rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_audio.cpp | 4 | ||||
| -rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_euphony.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp index 992200d16f..14bc840326 100644 --- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp @@ -212,7 +212,6 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac // 80 INTCB(pcmUpdateEnvelopeGenerator), INTCB(notImpl) - }; #undef INTCB @@ -788,8 +787,7 @@ void TownsAudioInterface::fmReset() { memset(&_fmSaveReg[0][240], 0x7f, 16); memset(_fmSaveReg[1], 0, 256); memset(&_fmSaveReg[1][240], 0x7f, 16); - _fmSaveReg[0][243] = _fmSaveReg[0][247] = _fmSaveReg[0][251] = _fmSaveReg[0][255] = - _fmSaveReg[1][243] = _fmSaveReg[1][247] = _fmSaveReg[1][251] = _fmSaveReg[1][255] = 0xff; + _fmSaveReg[0][243] = _fmSaveReg[0][247] = _fmSaveReg[0][251] = _fmSaveReg[0][255] = _fmSaveReg[1][243] = _fmSaveReg[1][247] = _fmSaveReg[1][251] = _fmSaveReg[1][255] = 0xff; for (int i = 0; i < 128; i++) fmLoadInstrument(i, _fmDefaultInstrument); diff --git a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp index e6f94b29b5..3a691c407d 100644 --- a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp @@ -857,7 +857,7 @@ void TownsEuphonyDriver::sendChanVolume() { while (*chan != -1) { _intf->callback(8, *chan, _para[1] & 0x7f); chan = &_assignedChannels[*chan].next; - }; + } } void TownsEuphonyDriver::sendPanPosition() { @@ -865,7 +865,7 @@ void TownsEuphonyDriver::sendPanPosition() { while (*chan != -1) { _intf->callback(3, *chan, _para[1] & 0x7f); chan = &_assignedChannels[*chan].next; - }; + } } void TownsEuphonyDriver::sendAllNotesOff() { @@ -882,7 +882,7 @@ void TownsEuphonyDriver::sendAllNotesOff() { _intf->callback(2, *chan); } chan = &_assignedChannels[*chan].next; - }; + } } void TownsEuphonyDriver::sendSetInstrument() { @@ -891,7 +891,7 @@ void TownsEuphonyDriver::sendSetInstrument() { _intf->callback(4, *chan, _para[0]); _intf->callback(7, *chan, 0); chan = &_assignedChannels[*chan].next; - }; + } } void TownsEuphonyDriver::sendPitch() { @@ -901,5 +901,5 @@ void TownsEuphonyDriver::sendPitch() { int16 pitch = (((READ_LE_UINT16(_para)) >> 1) & 0x3fff) - 0x2000; _intf->callback(7, *chan, pitch); chan = &_assignedChannels[*chan].next; - }; + } } |