diff options
| author | Torbjörn Andersson | 2003-10-01 09:40:28 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-01 09:40:28 +0000 |
| commit | cee745dbf93ef1919a2eafec630f4a1991578052 (patch) | |
| tree | 9547b297b83467324d60d57ef732848eb9fd2092 /sky/music | |
| parent | 920c11972eb1e3a2fe49fa9acff9814e2fac0eb3 (diff) | |
| download | scummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.tar.gz scummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.tar.bz2 scummvm-rg350-cee745dbf93ef1919a2eafec630f4a1991578052.zip | |
Whitespace changes
svn-id: r10516
Diffstat (limited to 'sky/music')
| -rw-r--r-- | sky/music/adlibchannel.h | 4 | ||||
| -rw-r--r-- | sky/music/adlibmusic.cpp | 2 | ||||
| -rw-r--r-- | sky/music/gmchannel.cpp | 8 | ||||
| -rw-r--r-- | sky/music/gmchannel.h | 2 | ||||
| -rw-r--r-- | sky/music/gmmusic.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sky/music/adlibchannel.h b/sky/music/adlibchannel.h index 8118213b52..f13fb78e96 100644 --- a/sky/music/adlibchannel.h +++ b/sky/music/adlibchannel.h @@ -75,7 +75,7 @@ private: InstrumentStruct *_instruments; uint16 *_frequenceTable; uint8 *_instrumentMap; - uint8 *_registerTable, *_opOutputTable; + uint8 *_registerTable, *_opOutputTable; uint8 *_adlibRegMirror; //- normal subs void setRegister(uint8 regNum, uint8 value); @@ -84,7 +84,7 @@ private: void adlibSetupInstrument(void); void setupInstrument(uint8 opcode); void setupChannelVolume(uint8 volume); - //- Streamfunctions from Command90hTable + //- Streamfunctions from Command90hTable void com90_caseNoteOff(void); // 0 void com90_stopChannel(void); // 1 void com90_setupInstrument(void); // 2 diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp index 52e0a7ed94..d3916269bd 100644 --- a/sky/music/adlibmusic.cpp +++ b/sky/music/adlibmusic.cpp @@ -31,7 +31,7 @@ SkyAdlibMusic::SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *sys : SkyMusicBase(pSkyDisk, system) { _driverFileBase = 60202; - _mixer = pMixer; + _mixer = pMixer; _sampleRate = pMixer->getOutputRate(); int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL); diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp index 744b15f383..16e493db52 100644 --- a/sky/music/gmchannel.cpp +++ b/sky/music/gmchannel.cpp @@ -22,8 +22,8 @@ #include "gmchannel.h" #include "common/util.h" -SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) -{ +SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) { + _musicData = pMusicData; _midiDrv = pMidiDrv; _channelData.midiChannelNumber = 0; @@ -59,8 +59,8 @@ void SkyGmChannel::stopNote(void) { _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x7B00 | 0 | 0x79000000); } -int32 SkyGmChannel::getNextEventTime(void) -{ +int32 SkyGmChannel::getNextEventTime(void) { + int32 retV = 0; uint8 cnt, lVal; for (cnt = 0; cnt < 4; cnt++) { diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h index af984056d1..8105141890 100644 --- a/sky/music/gmchannel.h +++ b/sky/music/gmchannel.h @@ -57,7 +57,7 @@ private: void adlibSetupInstrument(void); void setupInstrument(uint8 opcode); void setupChannelVolume(uint8 volume); - //- Streamfunctions from Command90hTable + //- Streamfunctions from Command90hTable void com90_caseNoteOff(void); // 0 void com90_stopChannel(void); // 1 void com90_setupInstrument(void); // 2 diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp index 58f65e73e6..581ebd841e 100644 --- a/sky/music/gmmusic.cpp +++ b/sky/music/gmmusic.cpp @@ -31,7 +31,7 @@ SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system) : SkyMusicBase(pSkyDisk, system) { _driverFileBase = 60200; - _midiDrv = pMidiDrv; + _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); if (midiRes != 0) { error("Can't open midi device. Errorcode: %d",midiRes); |