diff options
| author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
| commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
| tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /engines/sky/music | |
| parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
| download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip | |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'engines/sky/music')
| -rw-r--r-- | engines/sky/music/adlibchannel.h | 4 | ||||
| -rw-r--r-- | engines/sky/music/gmchannel.cpp | 2 | ||||
| -rw-r--r-- | engines/sky/music/mt32music.cpp | 8 | ||||
| -rw-r--r-- | engines/sky/music/musicbase.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index d73de0b0de..67c0b5d176 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -78,7 +78,7 @@ private: uint8 *_instrumentMap; uint8 *_registerTable, *_opOutputTable; uint8 *_adlibRegMirror; - + // normal subs void setRegister(uint8 regNum, uint8 value); int32 getNextEventTime(void); @@ -87,7 +87,7 @@ private: void setupInstrument(uint8 opcode); void setupChannelVolume(uint8 volume); void stopNote(void); - + // Streamfunctions from Command90hTable void com90_caseNoteOff(void); // 0 void com90_stopChannel(void); // 1 diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index d7d2ba854b..fc35fed391 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -119,7 +119,7 @@ uint8 GmChannel::process(uint16 aktTime) { case 11: com90_getChannelPanValue(); break; case 12: com90_setLoopPoint(); break; case 13: com90_getChannelControl(); break; - + default: error("GmChannel: Unknown music opcode 0x%02X", opcode); break; diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 2be19a0651..aa784e7437 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -102,10 +102,10 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) { return false; // decompress data from stream - sysExBuf[ 0] = 0x41; - sysExBuf[ 1] = 0x10; - sysExBuf[ 2] = 0x16; - sysExBuf[ 3] = 0x12; + sysExBuf[ 0] = 0x41; + sysExBuf[ 1] = 0x10; + sysExBuf[ 2] = 0x16; + sysExBuf[ 3] = 0x12; sysExBuf[ 4] = 0x5; sysExBuf[ 5] = sysExData[0] >> 4; // patch offset part 1 sysExBuf[ 6] = (sysExData[0] & 0xF) << 3; // patch offset part 2 diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index b6ea150d94..9bf7a62a21 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -146,10 +146,10 @@ void MusicBase::startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; } -uint8 MusicBase::giveVolume(void) { - return (uint8)_musicVolume; +uint8 MusicBase::giveVolume(void) { + return (uint8)_musicVolume; } - + uint8 MusicBase::giveCurrentMusic(void) { return _currentMusic; } |