[Scummvm-cvs-logs] SF.net SVN: scummvm:[47135] scummvm/trunk/engines/sci/sound

[lordhoto at users.sourceforge.net]

Revision: 47135
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47135&view=rev
Author:   lordhoto
Date:     2010-01-07 17:28:15 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
Some formatting fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/audio.cpp
    scummvm/trunk/engines/sci/sound/audio.h
    scummvm/trunk/engines/sci/sound/music.h

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-01-07 17:14:44 UTC (rev 47134)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-01-07 17:28:15 UTC (rev 47135)
@@ -163,7 +163,7 @@
 	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 @@
 	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;

Modified: scummvm/trunk/engines/sci/sound/audio.h
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.h	2010-01-07 17:14:44 UTC (rev 47134)
+++ scummvm/trunk/engines/sci/sound/audio.h	2010-01-07 17:28:15 UTC (rev 47135)
@@ -64,8 +64,8 @@
 	~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 @@
 	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;

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-01-07 17:14:44 UTC (rev 47134)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-01-07 17:28:15 UTC (rev 47135)
@@ -104,7 +104,7 @@
 //protected:
 #endif
 	MidiParser_SCI *pMidiParser;
-	Audio::AudioStream* pStreamAud;
+	Audio::AudioStream *pStreamAud;
 	Audio::SoundHandle hCurrentAud;
 
 public:
@@ -178,7 +178,7 @@
 	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);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.