diff options
| author | Johannes Schickel | 2010-01-07 17:28:15 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-07 17:28:15 +0000 |
| commit | 45b6f84ba721d8388290b45d9f09d59d2e3d2068 (patch) | |
| tree | 77052af377a73f56cccb993428badb3f46453ecc | |
| parent | aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34 (diff) | |
| download | scummvm-rg350-45b6f84ba721d8388290b45d9f09d59d2e3d2068.tar.gz scummvm-rg350-45b6f84ba721d8388290b45d9f09d59d2e3d2068.tar.bz2 scummvm-rg350-45b6f84ba721d8388290b45d9f09d59d2e3d2068.zip | |
Some formatting fixes.
svn-id: r47135
| -rw-r--r-- | engines/sci/sound/audio.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/sound/audio.h | 6 | ||||
| -rw-r--r-- | engines/sci/sound/music.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index bfc1fed330..392290853e 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -163,7 +163,7 @@ static bool readSOLHeader(Common::SeekableReadStream *audioStream, int headerSiz return true; } -static byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, byte audioFlags, byte &flags) { +static byte *readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, byte audioFlags, byte &flags) { byte *buffer; // Convert the SOL stream flags to our own format @@ -192,7 +192,7 @@ static byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, return buffer; } -Audio::AudioStream* AudioPlayer::getAudioStream(uint32 number, uint32 volume, int *sampleLen) { +Audio::AudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 volume, int *sampleLen) { Audio::AudioStream *audioStream = 0; uint32 size = 0; byte *data = 0; diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h index f71cabc735..d704dfca07 100644 --- a/engines/sci/sound/audio.h +++ b/engines/sci/sound/audio.h @@ -64,8 +64,8 @@ public: ~AudioPlayer(); void setAudioRate(uint16 rate) { _audioRate = rate; } - Audio::SoundHandle* getAudioHandle() { return &_audioHandle; } - Audio::AudioStream* getAudioStream(uint32 number, uint32 volume, int *sampleLen); + Audio::SoundHandle *getAudioHandle() { return &_audioHandle; } + Audio::AudioStream *getAudioStream(uint32 number, uint32 volume, int *sampleLen); int getAudioPosition(); int startAudio(uint16 module, uint32 tuple); void stopAudio(); @@ -87,7 +87,7 @@ private: ResourceManager *_resMan; uint16 _audioRate; Audio::SoundHandle _audioHandle; - Audio::Mixer* _mixer; + Audio::Mixer *_mixer; Resource *_syncResource; /**< Used by kDoSync for speech syncing in CD talkie games */ uint _syncOffset; uint32 _audioCdStart; diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index 3c7b1492a6..0ff4eb3257 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -104,7 +104,7 @@ public: //protected: #endif MidiParser_SCI *pMidiParser; - Audio::AudioStream* pStreamAud; + Audio::AudioStream *pStreamAud; Audio::SoundHandle hCurrentAud; public: @@ -178,7 +178,7 @@ public: MusicList::iterator getPlayListStart() { return _playList.begin(); } MusicList::iterator getPlayListEnd() { return _playList.end(); } - void sendMidiCommand (uint32 cmd) { + void sendMidiCommand(uint32 cmd) { Common::StackLock lock(_mutex); _pMidiDrv->send(cmd); } |