diff options
author | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
commit | aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch) | |
tree | 95f119e687a666f65aad5041910c43bdfd4f2929 /engines/scumm/player_v2.h | |
parent | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff) | |
download | scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2 scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip |
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/scumm/player_v2.h')
-rw-r--r-- | engines/scumm/player_v2.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index e2dd252b5b..83094617da 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -178,7 +178,7 @@ public: bool isStereo() const { return true; } bool endOfData() const { return false; } int getRate() const { return _sample_rate; } - + protected: #include "common/pack-start.h" // START STRUCT PACKING @@ -192,12 +192,12 @@ protected: int16 vibrato2; int16 noise; } PACKED_STRUCT; - + struct Voice2 { byte *amplitudeOutput; byte *freqOutput; byte *octaveOutput; - + uint8 channel; int8 sustainLevel; int8 attackRate; @@ -208,7 +208,7 @@ protected: int8 releaseTime; int8 vibratoRate; int8 vibratoDepth; - + int8 curVibratoRate; int8 curVibratoUnk; @@ -230,7 +230,7 @@ protected: byte chanNumber; } PACKED_STRUCT; - + struct MusicChip { byte ampl[4]; byte freq[4]; @@ -241,7 +241,7 @@ protected: Voice _cmsVoicesBase[16]; Voice2 _cmsVoices[8]; MusicChip _cmsChips[2]; - + int8 _tempo; int8 _tempoSum; byte _looping; @@ -251,35 +251,35 @@ protected: byte _midiChannelUse[16]; byte *_midiData; byte *_midiSongBegin; - + int _loadedMidiSong; - + byte _lastMidiCommand; uint _outputTableReady; byte _clkFrequenz; byte _restart; byte _curSno; - + void loadMidiData(byte *data, int sound); void play(); - + void processChannel(Voice2 *channel); void processRelease(Voice2 *channel); void processAttack(Voice2 *channel); void processDecay(Voice2 *channel); void processSustain(Voice2 *channel); void processVibrato(Voice2 *channel); - + void playMusicChips(const MusicChip *table); void playNote(byte *&data); void clearNote(byte *&data); void offAllChannels(); void playVoice(); void processMidiData(uint ticks); - + Voice2 *getFreeVoice(); Voice2 *getPlayVoice(byte param); - + // from Player_V2 protected: bool _isV3Game; |