diff options
author | Paweł Kołodziejski | 2003-03-06 17:58:13 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2003-03-06 17:58:13 +0000 |
commit | 093428ae9a6a1fd33003a8a0827d7410501a74cb (patch) | |
tree | 00a37a896d37505db01dd69a162627df49e4990c /scumm/sound.h | |
parent | 90680fe9bb614c1c5b7030821445e294c937f152 (diff) | |
download | scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.tar.gz scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.tar.bz2 scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.zip |
and more cleanup
svn-id: r6718
Diffstat (limited to 'scumm/sound.h')
-rw-r--r-- | scumm/sound.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index db759c316c..6252c52540 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -42,16 +42,16 @@ enum { bool _soundsPaused2; bool _soundVolumePreset; - char * _nameBundleMusic; - char * _newNameBundleMusic; + char *_nameBundleMusic; + char *_newNameBundleMusic; byte _musicDisk; byte _voiceDisk; int32 _currentSampleBundleMusic; int32 _numberSamplesBundleMusic; int32 _offsetSampleBundleMusic; int32 _offsetBufBundleMusic; - byte * _musicBundleBufFinal; - byte * _musicBundleBufOutput; + byte *_musicBundleBufFinal; + byte *_musicBundleBufOutput; bool _pauseBundleMusic; int32 _bundleMusicTrack; bool _musicBundleToBeChanged; @@ -125,7 +125,7 @@ enum { }; #endif - Scumm * _scumm; + Scumm *_scumm; public: @@ -159,16 +159,16 @@ public: void setupSound(); void pauseSounds(bool pause); int startSfxSound(File *file, int file_size); - File * openSfxFile(); + File *openSfxFile(); void stopSfxSound(); bool isSfxFinished(); - uint32 decode12BitsSample(byte * src, byte ** dst, uint32 size, bool stereo); - void playBundleMusic(char * song); + uint32 decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo); + void playBundleMusic(char *song); void pauseBundleMusic(bool state); - void bundleMusicHandler(Scumm * scumm); + void bundleMusicHandler(Scumm *scumm); void stopBundleMusic(); int playBundleSound(char *sound); - byte * readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint32 & loops); + byte *readCreativeVocFile(byte *ptr, uint32 &size, uint32 &rate, uint32 &loops); int playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned); int playSfxSound_MP3(void *sound, uint32 size); int playSfxSound_Vorbis(void *sound, uint32 size); |