aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/music/mt32music.cpp
diff options
context:
space:
mode:
authorJoost Peters2009-02-13 16:55:16 +0000
committerJoost Peters2009-02-13 16:55:16 +0000
commitf051fbb9d811d63c20c4a8d1232c877574922b4a (patch)
tree5817e04d528644ef8d8d9096cbb552e0ea73dfcd /engines/sky/music/mt32music.cpp
parent501b3215323fac6efbd5cbd5168e6118263f2809 (diff)
downloadscummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.gz
scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.bz2
scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.zip
Formatting changes / consistency
svn-id: r36304
Diffstat (limited to 'engines/sky/music/mt32music.cpp')
-rw-r--r--engines/sky/music/mt32music.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp
index aa784e7437..816a77fa9a 100644
--- a/engines/sky/music/mt32music.cpp
+++ b/engines/sky/music/mt32music.cpp
@@ -33,13 +33,10 @@
namespace Sky {
void MT32Music::passTimerFunc(void *param) {
-
((MT32Music*)param)->timerCall();
}
-MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk)
- : MusicBase(pDisk) {
-
+MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) {
_driverFileBase = 60200;
_midiDrv = pMidiDrv;
int midiRes = _midiDrv->open();
@@ -50,7 +47,6 @@ MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk)
}
MT32Music::~MT32Music(void) {
-
_midiDrv->close();
_midiDrv->setTimerCallback(NULL, NULL);
delete _midiDrv;
@@ -78,13 +74,11 @@ void MT32Music::setVolume(uint16 volume) {
}
void MT32Music::setupPointers(void) {
-
_musicDataLoc = READ_LE_UINT16(_musicData + 0x7DC);
_sysExSequence = READ_LE_UINT16(_musicData + 0x7E0) + _musicData;
}
void MT32Music::setupChannels(uint8 *channelData) {
-
_numberOfChannels = channelData[0];
channelData++;
for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
@@ -95,7 +89,6 @@ void MT32Music::setupChannels(uint8 *channelData) {
}
bool MT32Music::processPatchSysEx(uint8 *sysExData) {
-
uint8 sysExBuf[15];
uint8 crc = 0;
if (sysExData[0] & 0x80)
@@ -125,7 +118,6 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) {
}
void MT32Music::startDriver(void) {
-
// setup timbres and patches using SysEx data
uint8* sysExData = _sysExSequence;
uint8 timbreNum = sysExData[0];